dwindows: mac/dw.m annotate

annotate mac/dw.m @ 2067:3ccd0da07514

Mac: Initial notification support for the Mac.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Thu, 14 May 2020 13:13:45 +0000
parents	19fb7f72051b
children	370baf78abdc

rev	line source
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2 * Dynamic Windows:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3 * A GTK like implementation of the MacOS GUI using Cocoa
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4 *
2067 3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	5 * (C) 2011-2020 Brian Smith <brian@dbsoft.org>
1938 5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	6 * (C) 2011-2018 Mark Hessling <mark@rexx.org>
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7 *
1774 4cc999e757a3 Check for pointerArrayWithWeakObjects before weakObjectsPointerArray on Mac bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1773 diff changeset	8 * Requires 10.5 or later.
942 3c9dfb004df6 Minor change to the build comment. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 941 diff changeset	9 * clang -std=c99 -g -o dwtest -D__MAC__ -I. dwtest.c mac/dw.m -framework Cocoa -framework WebKit
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11 #import <Cocoa/Cocoa.h>
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	12 #import <WebKit/WebKit.h>
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	13 #include "dw.h"
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	14 #include <sys/utsname.h>
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	15 #include <sys/socket.h>
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	16 #include <sys/un.h>
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	17 #include <sys/mman.h>
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	18 #include <sys/time.h>
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	19 #include <sys/stat.h>
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	20 #include <math.h>
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	21
1956 2924bc788170 Mac: Added code to avoid unused variable/parameter warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1955 diff changeset	22 /* This may move to dw.h for use on all platforms in the future */
2924bc788170 Mac: Added code to avoid unused variable/parameter warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1955 diff changeset	23 #define __DW_UNUSED__ __attribute__((unused))
2924bc788170 Mac: Added code to avoid unused variable/parameter warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1955 diff changeset	24
719 d5e49ef8f541 Updated the #if for Snow Leopard/Leopard builds to handle them not being defined properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 718 diff changeset	25 /* Create a define to let us know to include Snow Leopard specific features */
1740 2d44ca344863 Test fix for warnings generated in Xcode 4.3... hopefully this still allows 10.5 builds to work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1719 diff changeset	26 #if defined(MAC_OS_X_VERSION_10_6) && ((defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) \|\| !defined(MAC_OS_X_VERSION_MAX_ALLOWED))
719 d5e49ef8f541 Updated the #if for Snow Leopard/Leopard builds to handle them not being defined properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 718 diff changeset	27 #define BUILDING_FOR_SNOW_LEOPARD
d5e49ef8f541 Updated the #if for Snow Leopard/Leopard builds to handle them not being defined properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 718 diff changeset	28 #endif
d5e49ef8f541 Updated the #if for Snow Leopard/Leopard builds to handle them not being defined properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 718 diff changeset	29
1994 4c53c8367a12 Mac: Some minor code cleanup in the SDK section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1993 diff changeset	30 /* Create a define to let us know to include Lion specific features */
1924 c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	31 #if defined(MAC_OS_X_VERSION_10_7) && ((defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7) \|\| !defined(MAC_OS_X_VERSION_MAX_ALLOWED))
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	32 #define BUILDING_FOR_LION
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	33 #endif
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	34
2067 3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	35 /* Create a define to let us know to include Mountain Lion specific features */
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	36 #if defined(MAC_OS_X_VERSION_10_8) && ((defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8) \|\| !defined(MAC_OS_X_VERSION_MAX_ALLOWED))
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	37 #define BUILDING_FOR_MOUNTAIN_LION
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	38 #endif
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	39
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	40 /* Macros to handle local auto-release pools */
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	41 #define DW_LOCAL_POOL_IN NSAutoreleasePool *localpool = nil; \
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	42 if(DWThread != (DWTID)-1 && pthread_self() != DWThread) \
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	43 localpool = [[NSAutoreleasePool alloc] init];
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	44 #define DW_LOCAL_POOL_OUT if(localpool) [localpool drain];
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	45
1904 2e456850e027 Minor fix for that last commit... code actually works now. ;) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1903 diff changeset	46 /* Handle deprecation of several constants in 10.10...
1903 b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	47 * the replacements are not available in earlier versions.
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	48 */
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	49 #if defined(MAC_OS_X_VERSION_10_10) && ((defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10) \|\| !defined(MAC_OS_X_VERSION_MAX_ALLOWED))
1903 b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	50 #define DWModalResponseOK NSModalResponseOK
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	51 #define DWModalResponseCancel NSModalResponseCancel
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	52 #define DWPaperOrientationPortrait NSPaperOrientationPortrait
2004 ebbdb2120659 Mac: Fix building on 10.9 and earlier due to changed constant names. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2002 diff changeset	53 #define DWCalendarUnitDay NSCalendarUnitDay
ebbdb2120659 Mac: Fix building on 10.9 and earlier due to changed constant names. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2002 diff changeset	54 #define DWCalendarUnitMonth NSCalendarUnitMonth
ebbdb2120659 Mac: Fix building on 10.9 and earlier due to changed constant names. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2002 diff changeset	55 #define DWCalendarUnitYear NSCalendarUnitYear
ebbdb2120659 Mac: Fix building on 10.9 and earlier due to changed constant names. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2002 diff changeset	56 #define DWCalendarIdentifierGregorian NSCalendarIdentifierGregorian
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	57 #define BUILDING_FOR_YOSEMITE
1903 b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	58 #else
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	59 #define DWModalResponseOK NSOKButton
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	60 #define DWModalResponseCancel NSCancelButton
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	61 #define DWPaperOrientationPortrait NSPortraitOrientation
2004 ebbdb2120659 Mac: Fix building on 10.9 and earlier due to changed constant names. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2002 diff changeset	62 #define DWCalendarUnitDay NSDayCalendarUnit
ebbdb2120659 Mac: Fix building on 10.9 and earlier due to changed constant names. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2002 diff changeset	63 #define DWCalendarUnitMonth NSMonthCalendarUnit
ebbdb2120659 Mac: Fix building on 10.9 and earlier due to changed constant names. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2002 diff changeset	64 #define DWCalendarUnitYear NSYearCalendarUnit
ebbdb2120659 Mac: Fix building on 10.9 and earlier due to changed constant names. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2002 diff changeset	65 #define DWCalendarIdentifierGregorian (NSString *)kCFGregorianCalendar
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	66 #endif
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	67
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	68 /* Handle deprecation of several constants in 10.12...
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	69 * the replacements are not available in earlier versions.
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	70 */
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	71 #if defined(MAC_OS_X_VERSION_10_12) && ((defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_12) \|\| !defined(MAC_OS_X_VERSION_MAX_ALLOWED))
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	72 #define DWButtonTypeSwitch NSButtonTypeSwitch
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	73 #define DWButtonTypeRadio NSButtonTypeRadio
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	74 #define DWButtonTypeMomentaryPushIn NSButtonTypeMomentaryPushIn
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	75 #define DWBezelStyleRegularSquare NSBezelStyleRegularSquare
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	76 #define DWBezelStyleRounded NSBezelStyleRounded
1940 38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	77 #define DWEventTypeApplicationDefined NSEventTypeApplicationDefined
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	78 #define DWCompositingOperationSourceOver NSCompositingOperationSourceOver
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	79 #define DWEventTypeKeyDown NSEventTypeKeyDown
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	80 #define DWEventModifierFlagControl NSEventModifierFlagControl
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	81 #define DWEventModifierFlagCommand NSEventModifierFlagCommand
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	82 #define DWEventModifierFlagOption NSEventModifierFlagOption
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	83 #define DWEventTypeRightMouseDown NSEventTypeRightMouseDown
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	84 #define DWEventTypeRightMouseUp NSEventTypeRightMouseUp
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	85 #define DWEventTypeLeftMouseDown NSEventTypeLeftMouseDown
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	86 #define DWEventTypeLeftMouseUp NSEventTypeLeftMouseUp
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	87 #define DWEventTypeOtherMouseDown NSEventTypeOtherMouseDown
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	88 #define DWEventTypeOtherMouseUp NSEventTypeOtherMouseUp
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	89 #define DWEventModifierFlagDeviceIndependentFlagsMask NSEventModifierFlagDeviceIndependentFlagsMask
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	90 #define DWEventMaskAny NSEventMaskAny
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	91 #define DWAlertStyleCritical NSAlertStyleCritical
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	92 #define DWAlertStyleInformational NSAlertStyleInformational
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	93 #define DWAlertStyleWarning NSAlertStyleWarning
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	94 #define DWTextAlignmentCenter NSTextAlignmentCenter
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	95 #define DWTextAlignmentRight NSTextAlignmentRight
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	96 #define DWTextAlignmentLeft NSTextAlignmentLeft
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	97 #define DWEventMaskLeftMouseUp NSEventMaskLeftMouseUp
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	98 #define DWEventMaskLeftMouseDown NSEventMaskLeftMouseDown
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	99 #define DWEventMaskRightMouseUp NSEventMaskRightMouseUp
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	100 #define DWEventMaskRightMouseDown NSEventMaskRightMouseDown
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	101 #define DWWindowStyleMaskResizable NSWindowStyleMaskResizable
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	102 #define BUILDING_FOR_SIERRA
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	103 #else
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	104 #define DWButtonTypeSwitch NSSwitchButton
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	105 #define DWButtonTypeRadio NSRadioButton
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	106 #define DWButtonTypeMomentaryPushIn NSMomentaryPushInButton
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	107 #define DWBezelStyleRegularSquare NSRegularSquareBezelStyle
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	108 #define DWBezelStyleRounded NSRoundedBezelStyle
1940 38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	109 #define DWEventTypeApplicationDefined NSApplicationDefined
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	110 #define DWCompositingOperationSourceOver NSCompositeSourceOver
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	111 #define DWEventTypeKeyDown NSKeyDown
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	112 #define DWEventModifierFlagControl NSControlKeyMask
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	113 #define DWEventModifierFlagCommand NSCommandKeyMask
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	114 #define DWEventModifierFlagOption NSAlternateKeyMask
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	115 #define DWEventTypeRightMouseDown NSRightMouseDown
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	116 #define DWEventTypeRightMouseUp NSRightMouseUp
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	117 #define DWEventTypeLeftMouseDown NSLeftMouseDown
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	118 #define DWEventTypeLeftMouseUp NSLeftMouseUp
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	119 #define DWEventTypeOtherMouseDown NSOtherMouseDown
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	120 #define DWEventTypeOtherMouseUp NSOtherMouseUp
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	121 #define DWEventModifierFlagDeviceIndependentFlagsMask NSDeviceIndependentModifierFlagsMask
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	122 #define DWEventMaskAny NSAnyEventMask
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	123 #define DWAlertStyleCritical NSCriticalAlertStyle
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	124 #define DWAlertStyleInformational NSInformationalAlertStyle
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	125 #define DWAlertStyleWarning NSWarningAlertStyle
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	126 #define DWTextAlignmentCenter NSCenterTextAlignment
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	127 #define DWTextAlignmentRight NSRightTextAlignment
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	128 #define DWTextAlignmentLeft NSLeftTextAlignment
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	129 #define DWEventMaskLeftMouseUp NSLeftMouseUpMask
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	130 #define DWEventMaskLeftMouseDown NSLeftMouseDownMask
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	131 #define DWEventMaskRightMouseUp NSRightMouseUpMask
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	132 #define DWEventMaskRightMouseDown NSRightMouseDownMask
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	133 #define DWWindowStyleMaskResizable NSResizableWindowMask
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	134 #endif
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	135
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	136 /* Handle deprecation of several constants in 10.13...
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	137 * the replacements are not available in earlier versions.
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	138 */
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	139 #if defined(MAC_OS_X_VERSION_10_13) && ((defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_13) \|\| !defined(MAC_OS_X_VERSION_MAX_ALLOWED))
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	140 #define DWControlStateValueOff NSControlStateValueOff
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	141 #define DWControlStateValueOn NSControlStateValueOn
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	142 #define BUILDING_FOR_HIGH_SIERRA
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	143 #else
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	144 #define DWControlStateValueOff NSOffState
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	145 #define DWControlStateValueOn NSOnState
1903 b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	146 #endif
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	147
1940 38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	148 /* Handle deprecation of several constants in 10.14...
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	149 * the replacements are not available in earlier versions.
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	150 */
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	151 #if defined(MAC_OS_X_VERSION_10_14) && ((defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_14) \|\| !defined(MAC_OS_X_VERSION_MAX_ALLOWED))
1941 b498fb0360fc Mac: 10.14 seems to have drastically changed the drawing mechanism. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1940 diff changeset	152 #define DWProgressIndicatorStyleBar NSProgressIndicatorStyleBar
1940 38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	153 #define BUILDING_FOR_MOJAVE
2067 3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	154 #import <UserNotifications/UserNotifications.h>
1940 38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	155 #else
1941 b498fb0360fc Mac: 10.14 seems to have drastically changed the drawing mechanism. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1940 diff changeset	156 #define DWProgressIndicatorStyleBar NSProgressIndicatorBarStyle
1952 8ce5c562348f Mac: Attempting a better WKWebKit fix, use the WK_API_ENABLED constant to determine if the API is available. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1951 diff changeset	157 #endif
8ce5c562348f Mac: Attempting a better WKWebKit fix, use the WK_API_ENABLED constant to determine if the API is available. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1951 diff changeset	158
1994 4c53c8367a12 Mac: Some minor code cleanup in the SDK section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1993 diff changeset	159 /* Handle deprecation of constants in 10.15... */
1993 e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	160 #if defined(MAC_OS_X_VERSION_10_15) && ((defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_15) \|\| !defined(MAC_OS_X_VERSION_MAX_ALLOWED))
e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	161 #define BUILDING_FOR_CATALINA
e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	162 #define WK_API_ENABLED 1
e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	163 #endif
e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	164
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	165 /* Macros to encapsulate running functions on the main thread
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	166 * on Mojave or later... and locking mutexes on earlier versions.
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	167 */
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	168 #ifdef BUILDING_FOR_MOJAVE
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	169 #define DW_FUNCTION_INIT
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	170 #define DW_FUNCTION_DEFINITION(func, rettype, ...) void _##func(NSPointerArray *_args); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	171 rettype API func(__VA_ARGS__) { \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	172 DW_LOCAL_POOL_IN; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	173 NSPointerArray *_args = [[NSPointerArray alloc] initWithOptions:NSPointerFunctionsOpaqueMemory]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	174 [_args addPointer:(void *)_##func];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	175 #define DW_FUNCTION_ADD_PARAM1(param1) [_args addPointer:(void *)&param1];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	176 #define DW_FUNCTION_ADD_PARAM2(param1, param2) [_args addPointer:(void *)&param1]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	177 [_args addPointer:(void *)&param2];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	178 #define DW_FUNCTION_ADD_PARAM3(param1, param2, param3) [_args addPointer:(void *)&param1]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	179 [_args addPointer:(void *)&param2]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	180 [_args addPointer:(void *)&param3];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	181 #define DW_FUNCTION_ADD_PARAM4(param1, param2, param3, param4) [_args addPointer:(void *)&param1]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	182 [_args addPointer:(void *)&param2]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	183 [_args addPointer:(void *)&param3]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	184 [_args addPointer:(void *)&param4];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	185 #define DW_FUNCTION_ADD_PARAM5(param1, param2, param3, param4, param5) [_args addPointer:(void *)&param1]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	186 [_args addPointer:(void *)&param2]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	187 [_args addPointer:(void *)&param3]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	188 [_args addPointer:(void *)&param4]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	189 [_args addPointer:(void *)&param5];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	190 #define DW_FUNCTION_ADD_PARAM6(param1, param2, param3, param4, param5, param6) \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	191 [_args addPointer:(void *)&param1]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	192 [_args addPointer:(void *)&param2]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	193 [_args addPointer:(void *)&param3]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	194 [_args addPointer:(void *)&param4]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	195 [_args addPointer:(void *)&param5]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	196 [_args addPointer:(void *)&param6];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	197 #define DW_FUNCTION_ADD_PARAM7(param1, param2, param3, param4, param5, param6, param7) \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	198 [_args addPointer:(void *)&param1]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	199 [_args addPointer:(void *)&param2]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	200 [_args addPointer:(void *)&param3]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	201 [_args addPointer:(void *)&param4]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	202 [_args addPointer:(void *)&param5]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	203 [_args addPointer:(void *)&param6]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	204 [_args addPointer:(void *)&param7];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	205 #define DW_FUNCTION_ADD_PARAM8(param1, param2, param3, param4, param5, param6, param7, param8) \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	206 [_args addPointer:(void *)&param1]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	207 [_args addPointer:(void *)&param2]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	208 [_args addPointer:(void *)&param3]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	209 [_args addPointer:(void *)&param4]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	210 [_args addPointer:(void *)&param5]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	211 [_args addPointer:(void *)&param6]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	212 [_args addPointer:(void *)&param7]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	213 [_args addPointer:(void *)&param8];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	214 #define DW_FUNCTION_ADD_PARAM9(param1, param2, param3, param4, param5, param6, param7, param8, param9) \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	215 [_args addPointer:(void *)&param1]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	216 [_args addPointer:(void *)&param2]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	217 [_args addPointer:(void *)&param3]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	218 [_args addPointer:(void *)&param4]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	219 [_args addPointer:(void *)&param5]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	220 [_args addPointer:(void *)&param6]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	221 [_args addPointer:(void *)&param7]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	222 [_args addPointer:(void *)&param8]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	223 [_args addPointer:(void *)&param9];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	224 #define DW_FUNCTION_RESTORE_PARAM1(param1, vartype1) vartype1 param1 = ((vartype1 )[_args pointerAtIndex:1]);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	225 #define DW_FUNCTION_RESTORE_PARAM2(param1, vartype1, param2, vartype2) \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	226 vartype1 param1 = ((vartype1 )[_args pointerAtIndex:1]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	227 vartype2 param2 = ((vartype2 )[_args pointerAtIndex:2]);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	228 #define DW_FUNCTION_RESTORE_PARAM3(param1, vartype1, param2, vartype2, param3, vartype3) \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	229 vartype1 param1 = ((vartype1 )[_args pointerAtIndex:1]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	230 vartype2 param2 = ((vartype2 )[_args pointerAtIndex:2]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	231 vartype3 param3 = ((vartype3 )[_args pointerAtIndex:3]);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	232 #define DW_FUNCTION_RESTORE_PARAM4(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4) \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	233 vartype1 param1 = ((vartype1 )[_args pointerAtIndex:1]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	234 vartype2 param2 = ((vartype2 )[_args pointerAtIndex:2]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	235 vartype3 param3 = ((vartype3 )[_args pointerAtIndex:3]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	236 vartype4 param4 = ((vartype4 )[_args pointerAtIndex:4]);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	237 #define DW_FUNCTION_RESTORE_PARAM5(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5) \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	238 vartype1 param1 = ((vartype1 )[_args pointerAtIndex:1]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	239 vartype2 param2 = ((vartype2 )[_args pointerAtIndex:2]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	240 vartype3 param3 = ((vartype3 )[_args pointerAtIndex:3]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	241 vartype4 param4 = ((vartype4 )[_args pointerAtIndex:4]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	242 vartype5 param5 = ((vartype5 )[_args pointerAtIndex:5]);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	243 #define DW_FUNCTION_RESTORE_PARAM6(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6) \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	244 vartype1 param1 = ((vartype1 )[_args pointerAtIndex:1]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	245 vartype2 param2 = ((vartype2 )[_args pointerAtIndex:2]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	246 vartype3 param3 = ((vartype3 )[_args pointerAtIndex:3]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	247 vartype4 param4 = ((vartype4 )[_args pointerAtIndex:4]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	248 vartype5 param5 = ((vartype5 )[_args pointerAtIndex:5]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	249 vartype6 param6 = ((vartype6 )[_args pointerAtIndex:6]);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	250 #define DW_FUNCTION_RESTORE_PARAM7(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6, param7, vartype7) \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	251 vartype1 param1 = ((vartype1 )[_args pointerAtIndex:1]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	252 vartype2 param2 = ((vartype2 )[_args pointerAtIndex:2]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	253 vartype3 param3 = ((vartype3 )[_args pointerAtIndex:3]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	254 vartype4 param4 = ((vartype4 )[_args pointerAtIndex:4]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	255 vartype5 param5 = ((vartype5 )[_args pointerAtIndex:5]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	256 vartype6 param6 = ((vartype6 )[_args pointerAtIndex:6]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	257 vartype7 param7 = ((vartype7 )[_args pointerAtIndex:7]);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	258 #define DW_FUNCTION_RESTORE_PARAM8(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6, param7, vartype7, param8, vartype8) \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	259 vartype1 param1 = ((vartype1 )[_args pointerAtIndex:1]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	260 vartype2 param2 = ((vartype2 )[_args pointerAtIndex:2]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	261 vartype3 param3 = ((vartype3 )[_args pointerAtIndex:3]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	262 vartype4 param4 = ((vartype4 )[_args pointerAtIndex:4]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	263 vartype5 param5 = ((vartype5 )[_args pointerAtIndex:5]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	264 vartype6 param6 = ((vartype6 )[_args pointerAtIndex:6]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	265 vartype7 param7 = ((vartype7 )[_args pointerAtIndex:7]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	266 vartype8 param8 = ((vartype8 )[_args pointerAtIndex:8]);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	267 #define DW_FUNCTION_RESTORE_PARAM9(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6, param7, vartype7, param8, vartype8, param9, vartype9) \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	268 vartype1 param1 = ((vartype1 )[_args pointerAtIndex:1]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	269 vartype2 param2 = ((vartype2 )[_args pointerAtIndex:2]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	270 vartype3 param3 = ((vartype3 )[_args pointerAtIndex:3]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	271 vartype4 param4 = ((vartype4 )[_args pointerAtIndex:4]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	272 vartype5 param5 = ((vartype5 )[_args pointerAtIndex:5]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	273 vartype6 param6 = ((vartype6 )[_args pointerAtIndex:6]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	274 vartype7 param7 = ((vartype7 )[_args pointerAtIndex:7]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	275 vartype8 param8 = ((vartype8 )[_args pointerAtIndex:8]); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	276 vartype9 param9 = ((vartype9 )[_args pointerAtIndex:9]);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	277 #define DW_FUNCTION_END }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	278 #define DW_FUNCTION_NO_RETURN(func) [DWObj safeCall:@selector(callBack:) withObject:_args]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	279 [_args release]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	280 DW_LOCAL_POOL_OUT; } \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	281 void _##func(NSPointerArray *_args) {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	282 #define DW_FUNCTION_RETURN(func, rettype) [DWObj safeCall:@selector(callBack:) withObject:_args]; {\
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	283 void *tmp = [_args pointerAtIndex:[_args count]-1]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	284 rettype myreturn = ((rettype )tmp); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	285 free(tmp); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	286 return myreturn; } \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	287 [_args release]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	288 DW_LOCAL_POOL_OUT; } \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	289 void _##func(NSPointerArray *_args) {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	290 #define DW_FUNCTION_RETURN_THIS(_retvar) { void *_myreturn = malloc(sizeof(_retvar)); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	291 memcpy(_myreturn, (void *)&_retvar, sizeof(_retvar)); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	292 [_args addPointer:_myreturn]; }}
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	293 #define DW_FUNCTION_RETURN_NOTHING }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	294 #else
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	295 /* Macros to protect access to thread unsafe classes */
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	296 #define DW_FUNCTION_INIT int _locked_by_me = FALSE; { \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	297 if(DWThread != (DWTID)-1 && pthread_self() != DWThread && pthread_self() != _dw_mutex_locked) { \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	298 dw_mutex_lock(DWThreadMutex); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	299 _dw_mutex_locked = pthread_self(); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	300 dw_mutex_lock(DWThreadMutex2); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	301 [DWObj performSelectorOnMainThread:@selector(synchronizeThread:) withObject:nil waitUntilDone:NO]; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	302 dw_mutex_lock(DWRunMutex); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	303 _locked_by_me = TRUE; } }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	304 #define DW_FUNCTION_DEFINITION(func, rettype, ...) rettype API func(__VA_ARGS__)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	305 #define DW_FUNCTION_ADD_PARAM1(param1)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	306 #define DW_FUNCTION_ADD_PARAM2(param1, param2)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	307 #define DW_FUNCTION_ADD_PARAM3(param1, param2, param3)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	308 #define DW_FUNCTION_ADD_PARAM4(param1, param2, param3, param4)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	309 #define DW_FUNCTION_ADD_PARAM5(param1, param2, param3, param4, param5)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	310 #define DW_FUNCTION_ADD_PARAM6(param1, param2, param3, param4, param5, param6)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	311 #define DW_FUNCTION_ADD_PARAM7(param1, param2, param3, param4, param5, param6, param7)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	312 #define DW_FUNCTION_ADD_PARAM8(param1, param2, param3, param4, param5, param6, param7, param8)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	313 #define DW_FUNCTION_ADD_PARAM9(param1, param2, param3, param4, param5, param6, param7, param8, param9)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	314 #define DW_FUNCTION_RESTORE_PARAM1(param1, vartype1)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	315 #define DW_FUNCTION_RESTORE_PARAM2(param1, vartype1, param2, vartype2)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	316 #define DW_FUNCTION_RESTORE_PARAM3(param1, vartype1, param2, vartype2, param3, vartype3)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	317 #define DW_FUNCTION_RESTORE_PARAM4(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	318 #define DW_FUNCTION_RESTORE_PARAM5(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	319 #define DW_FUNCTION_RESTORE_PARAM6(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	320 #define DW_FUNCTION_RESTORE_PARAM7(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6, param7, vartype7)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	321 #define DW_FUNCTION_RESTORE_PARAM8(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6, param7, vartype7, param8, vartype8)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	322 #define DW_FUNCTION_RESTORE_PARAM9(param1, vartype1, param2, vartype2, param3, vartype3, param4, vartype4, param5, vartype5, param6, vartype6, param7, vartype7, param8, vartype8, param9, vartype9)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	323 #define DW_FUNCTION_END
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	324 #define DW_FUNCTION_NO_RETURN(func)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	325 #define DW_FUNCTION_RETURN(func, rettype)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	326 #define DW_FUNCTION_RETURN_THIS(retvar) { \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	327 if(pthread_self() != DWThread && _locked_by_me == TRUE) { \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	328 dw_mutex_unlock(DWRunMutex); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	329 dw_mutex_unlock(DWThreadMutex2); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	330 _dw_mutex_locked = (pthread_t)-1; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	331 dw_mutex_unlock(DWThreadMutex); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	332 _locked_by_me = FALSE; } } \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	333 return retvar;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	334 #define DW_FUNCTION_RETURN_NOTHING { \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	335 if(pthread_self() != DWThread && _locked_by_me == TRUE) { \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	336 dw_mutex_unlock(DWRunMutex); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	337 dw_mutex_unlock(DWThreadMutex2); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	338 _dw_mutex_locked = (pthread_t)-1; \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	339 dw_mutex_unlock(DWThreadMutex); \
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	340 _locked_by_me = FALSE; } }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	341 HMTX DWRunMutex;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	342 HMTX DWThreadMutex;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	343 HMTX DWThreadMutex2;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	344 DWTID _dw_mutex_locked = (DWTID)-1;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	345 #endif
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	346
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	347 unsigned long _colors[] =
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	348 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	349 0x00000000, /* 0 black */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	350 0x000000bb, /* 1 red */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	351 0x0000bb00, /* 2 green */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	352 0x0000aaaa, /* 3 yellow */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	353 0x00cc0000, /* 4 blue */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	354 0x00bb00bb, /* 5 magenta */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	355 0x00bbbb00, /* 6 cyan */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	356 0x00bbbbbb, /* 7 white */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	357 0x00777777, /* 8 grey */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	358 0x000000ff, /* 9 bright red */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	359 0x0000ff00, /* 10 bright green */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	360 0x0000eeee, /* 11 bright yellow */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	361 0x00ff0000, /* 12 bright blue */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	362 0x00ff00ff, /* 13 bright magenta */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	363 0x00eeee00, /* 14 bright cyan */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	364 0x00ffffff, /* 15 bright white */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	365 0xff000000 /* 16 default color */
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	366 };
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	367
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	368 /*
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	369 * List those icons that have transparency first
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	370 */
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	371 #define NUM_EXTS 8
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	372 char *image_exts[NUM_EXTS] =
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	373 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	374 ".png",
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	375 ".ico",
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	376 ".icns",
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	377 ".gif",
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	378 ".jpg",
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	379 ".jpeg",
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	380 ".tiff",
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	381 ".bmp"
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	382 };
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	383
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	384 char _dw_get_image_extension(const char filename)
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	385 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	386 char *file = alloca(strlen(filename) + 6);
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	387 int found_ext = 0,i;
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	388
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	389 /* Try various extentions */
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	390 for ( i = 0; i < NUM_EXTS; i++ )
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	391 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	392 strcpy( file, filename );
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	393 strcat( file, image_exts[i] );
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	394 if ( access( file, R_OK ) == 0 )
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	395 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	396 found_ext = 1;
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	397 break;
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	398 }
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	399 }
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	400 if ( found_ext == 1 )
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	401 {
940 b5ae9cf15f68 Fix for returning wrong extension in _dw_get_image_extension; only worked for .ico files mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 939 diff changeset	402 return image_exts[i];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	403 }
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	404 return NULL;
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	405 }
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	406
1958 45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	407 /* Return the RGB color regardless if a predefined color was passed */
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	408 unsigned long _get_color(unsigned long thiscolor)
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	409 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	410 if(thiscolor & DW_RGB_COLOR)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	411 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	412 return thiscolor & ~DW_RGB_COLOR;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	413 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	414 else if(thiscolor < 17)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	415 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	416 return _colors[thiscolor];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	417 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	418 return 0;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	419 }
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	420
1958 45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	421 /* Returns TRUE of Mojave or later is in Dark Mode */
1984 09a102c92788 Mac: Fix building on MacOS 10.7 Lion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1983 diff changeset	422 BOOL _is_dark(id object)
1958 45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	423 {
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	424 #ifdef BUILDING_FOR_MOJAVE
1984 09a102c92788 Mac: Fix building on MacOS 10.7 Lion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1983 diff changeset	425 NSAppearance *appearance = [object effectiveAppearance];
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	426
1958 45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	427 if(@available(macOS 10.14, *))
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	428 {
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	429 NSAppearanceName basicAppearance = [appearance bestMatchFromAppearancesWithNames:@[
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	430 NSAppearanceNameAqua,
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	431 NSAppearanceNameDarkAqua]];
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	432 return [basicAppearance isEqualToString:NSAppearanceNameDarkAqua];
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	433 }
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	434 #endif
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	435 return NO;
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	436 }
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	437
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	438 /* Thread specific storage */
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	439 #if !defined(GARBAGE_COLLECT)
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	440 pthread_key_t _dw_pool_key;
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	441 #endif
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	442 pthread_key_t _dw_fg_color_key;
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	443 pthread_key_t _dw_bg_color_key;
1770 2396655d43f1 Fix some warnings with Mac 10.8 and Xcode 4.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	444 int DWOSMajor, DWOSMinor, DWOSBuild;
1381 3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	445 static char _dw_bundle_path[PATH_MAX+1] = { 0 };
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	446
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	447 /* Create a default colors for a thread */
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	448 void _init_colors(void)
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	449 {
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	450 NSColor *fgcolor = [[NSColor grayColor] retain];
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	451 pthread_setspecific(_dw_fg_color_key, fgcolor);
891 3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	452 pthread_setspecific(_dw_bg_color_key, NULL);
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	453 }
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	454
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	455 typedef struct _sighandler
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	456 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	457 struct _sighandler *next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	458 ULONG message;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	459 HWND window;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	460 int id;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	461 void *signalfunction;
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	462 void *discfunction;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	463 void *data;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	464
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	465 } SignalHandler;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	466
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	467 SignalHandler *Root = NULL;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	468
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	469 /* Some internal prototypes */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	470 static void _do_resize(Box *thisbox, int x, int y);
916 44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	471 void _handle_resize_events(Box *thisbox);
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	472 int _remove_userdata(UserData *root, const char varname, int all);
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	473 int _dw_main_iteration(NSDate *date);
1945 7af41bfd5190 Mac: Moved an internal prototype to be with the rest for consistency. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1944 diff changeset	474 NSGraphicsContext _dw_draw_context(NSBitmapImageRep image);
1993 e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	475 typedef id (*DWIMP)(id, SEL, ...);
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	476
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	477 /* Internal function to queue a window redraw */
1422 131bedf41332 Initial support for automatic redrawing on Windows and ranged/bitmap auto-calculation support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1421 diff changeset	478 void _dw_redraw(id window, int skip)
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	479 {
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	480 static id lastwindow = nil;
1425 1628bf383893 Changes to _dw_redraw() to prevent infinite recursion on OS/2, Win and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1422 diff changeset	481 id redraw = lastwindow;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	482
1422 131bedf41332 Initial support for automatic redrawing on Windows and ranged/bitmap auto-calculation support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1421 diff changeset	483 if(skip && window == nil)
1425 1628bf383893 Changes to _dw_redraw() to prevent infinite recursion on OS/2, Win and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1422 diff changeset	484 return;
1628bf383893 Changes to _dw_redraw() to prevent infinite recursion on OS/2, Win and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1422 diff changeset	485
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	486 lastwindow = window;
1425 1628bf383893 Changes to _dw_redraw() to prevent infinite recursion on OS/2, Win and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1422 diff changeset	487 if(redraw != lastwindow && redraw != nil)
1628bf383893 Changes to _dw_redraw() to prevent infinite recursion on OS/2, Win and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1422 diff changeset	488 {
1628bf383893 Changes to _dw_redraw() to prevent infinite recursion on OS/2, Win and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1422 diff changeset	489 dw_window_redraw(redraw);
1628bf383893 Changes to _dw_redraw() to prevent infinite recursion on OS/2, Win and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1422 diff changeset	490 }
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	491 }
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	492
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	493 SignalHandler *_get_handler(HWND window, int messageid)
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	494 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	495 SignalHandler *tmp = Root;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	496
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	497 /* Find any callbacks for this function */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	498 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	499 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	500 if(tmp->message == messageid && window == tmp->window)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	501 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	502 return tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	503 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	504 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	505 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	506 return NULL;
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	507 }
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	508
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	509 typedef struct
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	510 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	511 ULONG message;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	512 char name[30];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	513
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	514 } SignalList;
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	515
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	516 /* List of signals */
2013 7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	517 #define SIGNALMAX 19
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	518
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	519 SignalList SignalTranslate[SIGNALMAX] = {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	520 { 1, DW_SIGNAL_CONFIGURE },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	521 { 2, DW_SIGNAL_KEY_PRESS },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	522 { 3, DW_SIGNAL_BUTTON_PRESS },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	523 { 4, DW_SIGNAL_BUTTON_RELEASE },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	524 { 5, DW_SIGNAL_MOTION_NOTIFY },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	525 { 6, DW_SIGNAL_DELETE },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	526 { 7, DW_SIGNAL_EXPOSE },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	527 { 8, DW_SIGNAL_CLICKED },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	528 { 9, DW_SIGNAL_ITEM_ENTER },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	529 { 10, DW_SIGNAL_ITEM_CONTEXT },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	530 { 11, DW_SIGNAL_LIST_SELECT },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	531 { 12, DW_SIGNAL_ITEM_SELECT },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	532 { 13, DW_SIGNAL_SET_FOCUS },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	533 { 14, DW_SIGNAL_VALUE_CHANGED },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	534 { 15, DW_SIGNAL_SWITCH_PAGE },
803 8555ac1bcbcd Attempt at implementing column click events. Doesn't seem to work yet but needed to commit before switching to laptop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 802 diff changeset	535 { 16, DW_SIGNAL_TREE_EXPAND },
2013 7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	536 { 17, DW_SIGNAL_COLUMN_CLICK },
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	537 { 18, DW_SIGNAL_HTML_RESULT },
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	538 { 19, DW_SIGNAL_HTML_CHANGED }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	539 };
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	540
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	541 int _event_handler1(id object, NSEvent *event, int message)
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	542 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	543 SignalHandler *handler = _get_handler(object, message);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	544 /* NSLog(@"Event handler - type %d\n", message); */
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	545
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	546 if(handler)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	547 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	548 switch(message)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	549 {
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	550 /* Timer event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	551 case 0:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	552 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	553 int (* API timerfunc)(void ) = (int ( API)(void *))handler->signalfunction;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	554
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	555 if(!timerfunc(handler->data))
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	556 dw_timer_disconnect(handler->id);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	557 return 0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	558 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	559 /* Configure/Resize event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	560 case 1:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	561 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	562 int (sizefunc)(HWND, int, int, void ) = handler->signalfunction;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	563 NSSize size;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	564
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	565 if([object isKindOfClass:[NSWindow class]])
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	566 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	567 NSWindow *window = object;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	568 size = [[window contentView] frame].size;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	569 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	570 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	571 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	572 NSView *view = object;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	573 size = [view frame].size;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	574 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	575
706 79b38b1f3346 Scrollbar event fixes... scale was wrong... not sure it is correct but it is better. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 705 diff changeset	576 if(size.width > 0 && size.height > 0)
79b38b1f3346 Scrollbar event fixes... scale was wrong... not sure it is correct but it is better. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 705 diff changeset	577 {
79b38b1f3346 Scrollbar event fixes... scale was wrong... not sure it is correct but it is better. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 705 diff changeset	578 return sizefunc(object, size.width, size.height, handler->data);
79b38b1f3346 Scrollbar event fixes... scale was wrong... not sure it is correct but it is better. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 705 diff changeset	579 }
79b38b1f3346 Scrollbar event fixes... scale was wrong... not sure it is correct but it is better. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 705 diff changeset	580 return 0;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	581 }
723 37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	582 case 2:
37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	583 {
1748 e4fcd1e81f0d Added optional utf8 parameter to keypress callback on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1744 diff changeset	584 int (keypressfunc)(HWND, char, int, int, void , char *) = handler->signalfunction;
723 37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	585 NSString *nchar = [event charactersIgnoringModifiers];
37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	586 int special = (int)[event modifierFlags];
724 41080d22edc8 Couple more fixes to keyhandling... committed before I finished what I was doing... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 723 diff changeset	587 unichar vk = [nchar characterAtIndex:0];
1748 e4fcd1e81f0d Added optional utf8 parameter to keypress callback on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1744 diff changeset	588 char *utf8 = NULL, ch = '\0';
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	589
723 37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	590 /* Handle a valid key */
724 41080d22edc8 Couple more fixes to keyhandling... committed before I finished what I was doing... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 723 diff changeset	591 if([nchar length] == 1)
723 37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	592 {
1748 e4fcd1e81f0d Added optional utf8 parameter to keypress callback on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1744 diff changeset	593 char tmp = (char )[nchar UTF8String];
899 3fbba8b1f440 Don't pass in a partial UTF8 string in the character field during key press events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 898 diff changeset	594 if(tmp && strlen(tmp) == 1)
723 37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	595 {
37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	596 ch = tmp[0];
37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	597 }
1748 e4fcd1e81f0d Added optional utf8 parameter to keypress callback on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1744 diff changeset	598 utf8 = tmp;
723 37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	599 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	600
1748 e4fcd1e81f0d Added optional utf8 parameter to keypress callback on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1744 diff changeset	601 return keypressfunc(handler->window, ch, (int)vk, special, handler->data, utf8);
723 37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	602 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	603 /* Button press and release event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	604 case 3:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	605 case 4:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	606 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	607 int (* API buttonfunc)(HWND, int, int, int, void ) = (int ( API)(HWND, int, int, int, void *))handler->signalfunction;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	608 NSPoint p = [NSEvent mouseLocation];
922 07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	609 int button = 1;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	610
1222 aac69b11e821 Fix to get button press events working from the task/statusbar on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1220 diff changeset	611 if([event isMemberOfClass:[NSEvent class]])
922 07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	612 {
1222 aac69b11e821 Fix to get button press events working from the task/statusbar on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1220 diff changeset	613 id view = [[[event window] contentView] superview];
aac69b11e821 Fix to get button press events working from the task/statusbar on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1220 diff changeset	614 NSEventType type = [event type];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	615
1222 aac69b11e821 Fix to get button press events working from the task/statusbar on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1220 diff changeset	616 p = [view convertPoint:[event locationInWindow] toView:object];
aac69b11e821 Fix to get button press events working from the task/statusbar on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1220 diff changeset	617
1940 38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	618 if(type == DWEventTypeRightMouseDown \|\| type == DWEventTypeRightMouseUp)
1222 aac69b11e821 Fix to get button press events working from the task/statusbar on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1220 diff changeset	619 {
aac69b11e821 Fix to get button press events working from the task/statusbar on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1220 diff changeset	620 button = 2;
aac69b11e821 Fix to get button press events working from the task/statusbar on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1220 diff changeset	621 }
1940 38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	622 else if(type == DWEventTypeOtherMouseDown \|\| type == DWEventTypeOtherMouseUp)
1222 aac69b11e821 Fix to get button press events working from the task/statusbar on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1220 diff changeset	623 {
aac69b11e821 Fix to get button press events working from the task/statusbar on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1220 diff changeset	624 button = 3;
aac69b11e821 Fix to get button press events working from the task/statusbar on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1220 diff changeset	625 }
1940 38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	626 else if([event modifierFlags] & DWEventModifierFlagControl)
1647 b2c26ed9031c On Mac set button to 2 (right) when Control key is pressed and left clicking bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1644 diff changeset	627 {
b2c26ed9031c On Mac set button to 2 (right) when Control key is pressed and left clicking bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1644 diff changeset	628 button = 2;
b2c26ed9031c On Mac set button to 2 (right) when Control key is pressed and left clicking bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1644 diff changeset	629 }
922 07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	630 }
07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	631
954 cfb12bf3bb06 Fixes for some more coordinate system issues on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 953 diff changeset	632 return buttonfunc(object, (int)p.x, (int)p.y, button, handler->data);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	633 }
886 d94a4fa0359e Implemented the motion notify event on Mac. Most of it was there except the event handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 882 diff changeset	634 /* Motion notify event */
d94a4fa0359e Implemented the motion notify event on Mac. Most of it was there except the event handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 882 diff changeset	635 case 5:
d94a4fa0359e Implemented the motion notify event on Mac. Most of it was there except the event handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 882 diff changeset	636 {
d94a4fa0359e Implemented the motion notify event on Mac. Most of it was there except the event handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 882 diff changeset	637 int (* API motionfunc)(HWND, int, int, int, void ) = (int ( API)(HWND, int, int, int, void *))handler->signalfunction;
945 254b50be1bc1 Coordinate system changes to button press and motion notify events on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 944 diff changeset	638 id view = [[[event window] contentView] superview];
254b50be1bc1 Coordinate system changes to button press and motion notify events on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 944 diff changeset	639 NSPoint p = [view convertPoint:[event locationInWindow] toView:object];
1773 da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	640 SEL spmb = NSSelectorFromString(@"pressedMouseButtons");
1993 e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	641 DWIMP ipmb = [[NSEvent class] respondsToSelector:spmb] ? (DWIMP)[[NSEvent class] methodForSelector:spmb] : 0;
1995 e0669accc85b Mac: Fix typecast to int of different size with gcc for 32bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1994 diff changeset	642 NSUInteger buttonmask = ipmb ? (NSUInteger)ipmb([NSEvent class], spmb) : (1 << [event buttonNumber]);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	643
1996 289a8ca4855b Mac: Clang didn't like the loss of precision without a cast from the previous change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1995 diff changeset	644 return motionfunc(object, (int)p.x, (int)p.y, (int)buttonmask, handler->data);
886 d94a4fa0359e Implemented the motion notify event on Mac. Most of it was there except the event handler. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 882 diff changeset	645 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	646 /* Window close event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	647 case 6:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	648 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	649 int (* API closefunc)(HWND, void ) = (int ( API)(HWND, void *))handler->signalfunction;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	650 return closefunc(object, handler->data);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	651 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	652 /* Window expose/draw event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	653 case 7:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	654 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	655 DWExpose exp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	656 int (* API exposefunc)(HWND, DWExpose , void ) = (int (* API)(HWND, DWExpose , void ))handler->signalfunction;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	657 NSRect rect = [object frame];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	658
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	659 exp.x = rect.origin.x;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	660 exp.y = rect.origin.y;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	661 exp.width = rect.size.width;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	662 exp.height = rect.size.height;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	663 int result = exposefunc(object, &exp, handler->data);
1941 b498fb0360fc Mac: 10.14 seems to have drastically changed the drawing mechanism. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1940 diff changeset	664 #ifndef BUILDING_FOR_MOJAVE
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	665 [[object window] flushWindow];
1941 b498fb0360fc Mac: 10.14 seems to have drastically changed the drawing mechanism. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1940 diff changeset	666 #endif
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	667 return result;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	668 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	669 /* Clicked event for buttons and menu items */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	670 case 8:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	671 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	672 int (* API clickfunc)(HWND, void ) = (int ( API)(HWND, void *))handler->signalfunction;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	673
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	674 return clickfunc(object, handler->data);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	675 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	676 /* Container class selection event */
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	677 case 9:
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	678 {
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	679 int (containerselectfunc)(HWND, char , void , void ) = handler->signalfunction;
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	680 void params = (void )event;
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	681
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	682 return containerselectfunc(handler->window, params[0], handler->data, params[1]);
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	683 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	684 /* Container context menu event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	685 case 10:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	686 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	687 int (* API containercontextfunc)(HWND, char , int, int, void , void ) = (int ( API)(HWND, char , int, int, void , void *))handler->signalfunction;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	688 char text = (char )event;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	689 void *user = NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	690 LONG x,y;
1068 efaa9ceeb253 Removed test for class member for itemdata in dw_tree_item_get_data() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1067 diff changeset	691
1061 d91e09dc3865 Fix for the item data field of the context event always being NULL even for tree items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1051 diff changeset	692 /* Fill in both items for the tree */
d91e09dc3865 Fix for the item data field of the context event always being NULL even for tree items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1051 diff changeset	693 if([object isKindOfClass:[NSOutlineView class]])
d91e09dc3865 Fix for the item data field of the context event always being NULL even for tree items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1051 diff changeset	694 {
d91e09dc3865 Fix for the item data field of the context event always being NULL even for tree items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1051 diff changeset	695 id item = event;
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	696 NSString *nstr = [item objectAtIndex:1];
1061 d91e09dc3865 Fix for the item data field of the context event always being NULL even for tree items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1051 diff changeset	697 text = (char *)[nstr UTF8String];
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	698 NSValue *value = [item objectAtIndex:2];
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	699 if(value && [value isKindOfClass:[NSValue class]])
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	700 {
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	701 user = [value pointerValue];
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	702 }
1061 d91e09dc3865 Fix for the item data field of the context event always being NULL even for tree items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1051 diff changeset	703 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	704
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	705 dw_pointer_query_pos(&x, &y);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	706
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	707 return containercontextfunc(handler->window, text, (int)x, (int)y, handler->data, user);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	708 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	709 /* Generic selection changed event for several classes */
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	710 case 11:
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	711 case 14:
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	712 {
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	713 int (* API valuechangedfunc)(HWND, int, void ) = (int ( API)(HWND, int, void *))handler->signalfunction;
1102 cfe7d2b6bc16 Added DW_INT_TO_POINTER/DW_UINT_TO_POINTER/DW_POINTER_TO_INT/DW_POINTER_TO_UINT macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1101 diff changeset	714 int selected = DW_POINTER_TO_INT(event);
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	715
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	716 return valuechangedfunc(handler->window, selected, handler->data);;
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	717 }
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	718 /* Tree class selection event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	719 case 12:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	720 {
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	721 int (* API treeselectfunc)(HWND, HTREEITEM, char , void , void ) = (int ( API)(HWND, HTREEITEM, char , void , void *))handler->signalfunction;
1874 71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	722 char *text = NULL;
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	723 void *user = NULL;
5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	724 id item = nil;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	725
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	726 if([object isKindOfClass:[NSOutlineView class]])
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	727 {
5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	728 item = (id)event;
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	729 NSString *nstr = [item objectAtIndex:1];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	730
727 f190b5c2ce16 Fixed 2 errors in the tree select event handler. Also removed unused experimental code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 726 diff changeset	731 if(nstr)
712 01107d8e033e Fixed the scrollbar maximum range to be correct. Also added some MLE code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 711 diff changeset	732 {
01107d8e033e Fixed the scrollbar maximum range to be correct. Also added some MLE code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 711 diff changeset	733 text = strdup([nstr UTF8String]);
01107d8e033e Fixed the scrollbar maximum range to be correct. Also added some MLE code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 711 diff changeset	734 }
1068 efaa9ceeb253 Removed test for class member for itemdata in dw_tree_item_get_data() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1067 diff changeset	735
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	736 NSValue *value = [item objectAtIndex:2];
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	737 if(value && [value isKindOfClass:[NSValue class]])
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	738 {
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	739 user = [value pointerValue];
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	740 }
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	741 int result = treeselectfunc(handler->window, item, text, handler->data, user);
720 357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	742 if(text)
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	743 {
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	744 free(text);
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	745 }
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	746 return result;
5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	747 }
1874 71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	748 else if(event)
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	749 {
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	750 void params = (void )event;
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	751
1874 71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	752 text = params[0];
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	753 user = params[1];
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	754 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	755
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	756 return treeselectfunc(handler->window, item, text, handler->data, user);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	757 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	758 /* Set Focus event */
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	759 case 13:
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	760 {
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	761 int (* API setfocusfunc)(HWND, void ) = (int ( API)(HWND, void *))handler->signalfunction;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	762
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	763 return setfocusfunc(handler->window, handler->data);
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	764 }
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	765 /* Notebook page change event */
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	766 case 15:
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	767 {
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	768 int (* API switchpagefunc)(HWND, unsigned long, void ) = (int ( API)(HWND, unsigned long, void *))handler->signalfunction;
1102 cfe7d2b6bc16 Added DW_INT_TO_POINTER/DW_UINT_TO_POINTER/DW_POINTER_TO_INT/DW_POINTER_TO_UINT macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1101 diff changeset	769 int pageid = DW_POINTER_TO_INT(event);
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	770
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	771 return switchpagefunc(handler->window, pageid, handler->data);
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	772 }
2013 7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	773 /* Tree expand event */
722 5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	774 case 16:
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	775 {
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	776 int (* API treeexpandfunc)(HWND, HTREEITEM, void ) = (int ( API)(HWND, HTREEITEM, void *))handler->signalfunction;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	777
722 5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	778 return treeexpandfunc(handler->window, (HTREEITEM)event, handler->data);
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	779 }
2013 7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	780 /* Column click event */
803 8555ac1bcbcd Attempt at implementing column click events. Doesn't seem to work yet but needed to commit before switching to laptop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 802 diff changeset	781 case 17:
8555ac1bcbcd Attempt at implementing column click events. Doesn't seem to work yet but needed to commit before switching to laptop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 802 diff changeset	782 {
2013 7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	783 int (* API clickcolumnfunc)(HWND, int, void *) = handler->signalfunction;
1102 cfe7d2b6bc16 Added DW_INT_TO_POINTER/DW_UINT_TO_POINTER/DW_POINTER_TO_INT/DW_POINTER_TO_UINT macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1101 diff changeset	784 int column_num = DW_POINTER_TO_INT(event);
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	785
803 8555ac1bcbcd Attempt at implementing column click events. Doesn't seem to work yet but needed to commit before switching to laptop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 802 diff changeset	786 return clickcolumnfunc(handler->window, column_num, handler->data);
8555ac1bcbcd Attempt at implementing column click events. Doesn't seem to work yet but needed to commit before switching to laptop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 802 diff changeset	787 }
2013 7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	788 /* HTML result event */
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	789 case 18:
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	790 {
2014 b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	791 int (* API htmlresultfunc)(HWND, int, char , void , void *) = handler->signalfunction;
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	792 void params = (void )event;
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	793 NSString *result = params[0];
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	794
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	795 return htmlresultfunc(handler->window, [result length] ? DW_ERROR_NONE : DW_ERROR_UNKNOWN, [result length] ? (char *)[result UTF8String] : NULL, params[1], handler->data);
2013 7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	796 }
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	797 /* HTML changed event */
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	798 case 19:
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	799 {
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	800 int (* API htmlchangedfunc)(HWND, int, char , void ) = handler->signalfunction;
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	801 void params = (void )event;
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	802 NSString *uri = params[1];
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	803
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	804 return htmlchangedfunc(handler->window, DW_POINTER_TO_INT(params[0]), (char *)[uri UTF8String], handler->data);
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	805 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	806 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	807 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	808 return -1;
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	809 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	810
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	811 /* Sub function to handle redraws */
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	812 int _event_handler(id object, NSEvent *event, int message)
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	813 {
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	814 int ret = _event_handler1(object, event, message);
1422 131bedf41332 Initial support for automatic redrawing on Windows and ranged/bitmap auto-calculation support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1421 diff changeset	815 if(ret != -1)
131bedf41332 Initial support for automatic redrawing on Windows and ranged/bitmap auto-calculation support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1421 diff changeset	816 _dw_redraw(nil, FALSE);
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	817 return ret;
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	818 }
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	819
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	820 /* Subclass for the Timer type */
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	821 @interface DWTimerHandler : NSObject { }
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	822 -(void)runTimer:(id)sender;
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	823 @end
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	824
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	825 @implementation DWTimerHandler
674 78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	826 -(void)runTimer:(id)sender { _event_handler(sender, nil, 0); }
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	827 @end
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	828
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	829 NSApplication *DWApp;
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	830 NSMenu *DWMainMenu;
740 bb3b2d804f0e Working on fonts some more.... setting a default label font that is smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 739 diff changeset	831 NSFont *DWDefaultFont;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	832 DWTimerHandler *DWHandler;
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	833 #if !defined(GARBAGE_COLLECT)
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	834 NSAutoreleasePool *pool;
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	835 #endif
1954 85229fe9ae5a Mac: 10.14 doesn't like too many needsDisplays so instead we keep a list of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1953 diff changeset	836 #ifdef BUILDING_FOR_MOJAVE
85229fe9ae5a Mac: 10.14 doesn't like too many needsDisplays so instead we keep a list of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1953 diff changeset	837 NSMutableArray *_DWDirtyDrawables;
85229fe9ae5a Mac: 10.14 doesn't like too many needsDisplays so instead we keep a list of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1953 diff changeset	838 #else
661 eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	839 HWND _DWLastDrawable;
1949 c71e5da5b801 Mac: Fix mojave #ifdefs so it builds pre-mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1948 diff changeset	840 #endif
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	841 DWTID DWThread = (DWTID)-1;
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	842
1558 9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	843 /* Send fake event to make sure the loop isn't stuck */
9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	844 void _dw_wakeup_app()
9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	845 {
1940 38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	846 [DWApp postEvent:[NSEvent otherEventWithType:DWEventTypeApplicationDefined
1558 9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	847 location:NSMakePoint(0, 0)
9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	848 modifierFlags:0
9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	849 timestamp:0
9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	850 windowNumber:0
9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	851 context:NULL
9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	852 subtype:0
9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	853 data1:0
9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	854 data2:0]
9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	855 atStart:NO];
9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	856 }
9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	857
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	858 /* Used for doing bitblts from the main thread */
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	859 typedef struct _bitbltinfo
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	860 {
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	861 id src;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	862 id dest;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	863 int xdest;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	864 int ydest;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	865 int width;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	866 int height;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	867 int xsrc;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	868 int ysrc;
1247 93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	869 int srcwidth;
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	870 int srcheight;
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	871 } DWBitBlt;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	872
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	873 /* Subclass for a test object type */
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	874 @interface DWObject : NSObject {}
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	875 -(void)uselessThread:(id)sender;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	876 #ifndef BUILDING_FOR_MOJAVE
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	877 -(void)synchronizeThread:(id)param;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	878 #endif
1378 a54720b10821 Fix menu items getting stuck highlighted on Mac if the action triggered a window focus change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1376 diff changeset	879 -(void)menuHandler:(id)param;
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	880 -(void)doBitBlt:(id)param;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	881 -(void)doFlush:(id)param;
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	882 @end
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	883
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	884 @interface DWMenuItem : NSMenuItem
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	885 {
1517 6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	886 int check;
6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	887 }
6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	888 -(void)setCheck:(int)input;
6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	889 -(int)check;
6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	890 -(void)dealloc;
6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	891 @end
6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	892
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	893 /* So basically to implement our event handlers...
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	894 * it looks like we are going to have to subclass
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	895 * basically everything. Was hoping to add methods
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	896 * to the superclasses but it looks like you can
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	897 * only add methods and no variables, which isn't
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	898 * going to work. -Brian
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	899 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	900
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	901 /* Subclass for a box type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	902 @interface DWBox : NSView
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	903 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	904 Box *box;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	905 void *userdata;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	906 NSColor *bgcolor;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	907 }
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	908 -(id)init;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	909 -(void)dealloc;
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	910 -(Box *)box;
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	911 -(id)contentView;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	912 -(void *)userdata;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	913 -(void)setUserdata:(void *)input;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	914 -(void)drawRect:(NSRect)rect;
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	915 -(BOOL)isFlipped;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	916 -(void)mouseDown:(NSEvent *)theEvent;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	917 -(void)mouseUp:(NSEvent *)theEvent;
701 c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	918 -(NSMenu )menuForEvent:(NSEvent )theEvent;
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	919 -(void)rightMouseUp:(NSEvent *)theEvent;
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	920 -(void)otherMouseDown:(NSEvent *)theEvent;
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	921 -(void)otherMouseUp:(NSEvent *)theEvent;
723 37c8d2b4cec5 Initial key press event/signal handling... does not seem to trap on all controls... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 722 diff changeset	922 -(void)keyDown:(NSEvent *)theEvent;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	923 -(void)setColor:(unsigned long)input;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	924 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	925
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	926 @implementation DWBox
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	927 -(id)init
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	928 {
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	929 self = [super init];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	930
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	931 if (self)
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	932 {
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	933 box = calloc(1, sizeof(Box));
1453 4b516ef23b62 Boxes need to default to vertical on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1449 diff changeset	934 box->type = DW_VERT;
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	935 box->vsize = box->hsize = SIZEEXPAND;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	936 box->width = box->height = 1;
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	937 }
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	938 return self;
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	939 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	940 -(void)dealloc
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	941 {
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	942 UserData *root = userdata;
1764 5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	943 if(box->items)
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	944 free(box->items);
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	945 free(box);
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	946 _remove_userdata(&root, NULL, TRUE);
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	947 dw_signal_disconnect_by_window(self);
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	948 [super dealloc];
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	949 }
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	950 -(Box *)box { return box; }
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	951 -(id)contentView { return self; }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	952 -(void *)userdata { return userdata; }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	953 -(void)setUserdata:(void *)input { userdata = input; }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	954 -(void)drawRect:(NSRect)rect
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	955 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	956 if(bgcolor)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	957 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	958 [bgcolor set];
755 f574028932cc Fix for crash when changing background colors, needed retain and release. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 754 diff changeset	959 NSRectFill([self bounds]);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	960 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	961 }
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	962 -(BOOL)isFlipped { return YES; }
701 c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	963 -(void)mouseDown:(NSEvent )theEvent { _event_handler(self, (void )1, 3); }
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	964 -(void)mouseUp:(NSEvent )theEvent { _event_handler(self, (void )1, 4); }
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	965 -(NSMenu )menuForEvent:(NSEvent )theEvent { _event_handler(self, (void *)2, 3); return nil; }
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	966 -(void)rightMouseUp:(NSEvent )theEvent { _event_handler(self, (void )2, 4); }
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	967 -(void)otherMouseDown:(NSEvent )theEvent { _event_handler(self, (void )3, 3); }
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	968 -(void)otherMouseUp:(NSEvent )theEvent { _event_handler(self, (void )3, 4); }
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	969 -(void)keyDown:(NSEvent *)theEvent { _event_handler(self, theEvent, 2); }
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	970 -(void)setColor:(unsigned long)input
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	971 {
755 f574028932cc Fix for crash when changing background colors, needed retain and release. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 754 diff changeset	972 id orig = bgcolor;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	973
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	974 if(input == _colors[DW_CLR_DEFAULT])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	975 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	976 bgcolor = nil;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	977 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	978 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	979 {
755 f574028932cc Fix for crash when changing background colors, needed retain and release. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 754 diff changeset	980 bgcolor = [[NSColor colorWithDeviceRed: DW_RED_VALUE(input)/255.0 green: DW_GREEN_VALUE(input)/255.0 blue: DW_BLUE_VALUE(input)/255.0 alpha: 1] retain];
812 f8bfb19090f9 dw_window_set_color() now affects boxes immediately (no longer on the next window refresh). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 811 diff changeset	981 [bgcolor set];
f8bfb19090f9 dw_window_set_color() now affects boxes immediately (no longer on the next window refresh). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 811 diff changeset	982 NSRectFill([self bounds]);
1848 68f923e57542 Attempt at resetting default colors with DW_CLR_DEFAULT on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1843 diff changeset	983 }
68f923e57542 Attempt at resetting default colors with DW_CLR_DEFAULT on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1843 diff changeset	984 [self setNeedsDisplay:YES];
755 f574028932cc Fix for crash when changing background colors, needed retain and release. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 754 diff changeset	985 [orig release];
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	986 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	987 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	988
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	989 /* Subclass for a group box type */
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	990 @interface DWGroupBox : NSBox
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	991 {
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	992 void *userdata;
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	993 NSColor *bgcolor;
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	994 NSSize borderSize;
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	995 }
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	996 -(Box *)box;
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	997 -(void *)userdata;
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	998 -(void)setUserdata:(void *)input;
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	999 @end
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	1000
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	1001 @implementation DWGroupBox
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	1002 -(Box *)box { return [[self contentView] box]; }
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	1003 -(void *)userdata { return userdata; }
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	1004 -(NSSize)borderSize { return borderSize; }
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1005 -(NSSize)initBorder
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	1006 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	1007 NSSize frameSize = [self frame].size;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1008
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	1009 if(frameSize.height < 20 \|\| frameSize.width < 20)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	1010 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	1011 frameSize.width = frameSize.height = 100;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	1012 [self setFrameSize:frameSize];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1013 }
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	1014 NSSize contentSize = [[self contentView] frame].size;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	1015 NSSize titleSize = [self titleRect].size;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1016
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	1017 borderSize.width = 100-contentSize.width;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	1018 borderSize.height = (100-contentSize.height)-titleSize.height;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	1019 return borderSize;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	1020 }
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	1021 -(void)setUserdata:(void *)input { userdata = input; }
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	1022 @end
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	1023
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	1024 @interface DWWindow : NSWindow
1101 d7eafaa054ab Added support for dw_window_redraw() causing splitbar panes to redraw without bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1100 diff changeset	1025 {
d7eafaa054ab Added support for dw_window_redraw() causing splitbar panes to redraw without bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1100 diff changeset	1026 int redraw;
1489 4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	1027 int shown;
1101 d7eafaa054ab Added support for dw_window_redraw() causing splitbar panes to redraw without bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1100 diff changeset	1028 }
898 bf2ca780f62d One more try at window key handling... since I can't seem to trap keyDown events in most places that get focus... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 895 diff changeset	1029 -(void)sendEvent:(NSEvent *)theEvent;
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	1030 -(void)keyDown:(NSEvent *)theEvent;
932 ed10b5284f36 Fixes for dw_window_capture(), dw_window_release() and motion notify events on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 931 diff changeset	1031 -(void)mouseDragged:(NSEvent *)theEvent;
1101 d7eafaa054ab Added support for dw_window_redraw() causing splitbar panes to redraw without bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1100 diff changeset	1032 -(int)redraw;
d7eafaa054ab Added support for dw_window_redraw() causing splitbar panes to redraw without bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1100 diff changeset	1033 -(void)setRedraw:(int)val;
1489 4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	1034 -(int)shown;
4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	1035 -(void)setShown:(int)val;
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	1036 @end
d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	1037
d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	1038 @implementation DWWindow
1129 ab73d0269a5b Ensure default keypress event is not processed if handler returns 1 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1128 diff changeset	1039 -(void)sendEvent:(NSEvent *)theEvent
ab73d0269a5b Ensure default keypress event is not processed if handler returns 1 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1128 diff changeset	1040 {
1133 25bea6526ca1 Similar Mac fix to what I just commited on Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1130 diff changeset	1041 int rcode = -1;
1940 38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	1042 if([theEvent type] == DWEventTypeKeyDown)
1129 ab73d0269a5b Ensure default keypress event is not processed if handler returns 1 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1128 diff changeset	1043 {
ab73d0269a5b Ensure default keypress event is not processed if handler returns 1 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1128 diff changeset	1044 rcode = _event_handler(self, theEvent, 2);
ab73d0269a5b Ensure default keypress event is not processed if handler returns 1 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1128 diff changeset	1045 }
1133 25bea6526ca1 Similar Mac fix to what I just commited on Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1130 diff changeset	1046 if ( rcode != TRUE )
1129 ab73d0269a5b Ensure default keypress event is not processed if handler returns 1 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1128 diff changeset	1047 [super sendEvent:theEvent];
ab73d0269a5b Ensure default keypress event is not processed if handler returns 1 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1128 diff changeset	1048 }
898 bf2ca780f62d One more try at window key handling... since I can't seem to trap keyDown events in most places that get focus... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 895 diff changeset	1049 -(void)keyDown:(NSEvent *)theEvent { }
949 451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1050 -(void)mouseDragged:(NSEvent *)theEvent { _event_handler(self, theEvent, 5); }
1101 d7eafaa054ab Added support for dw_window_redraw() causing splitbar panes to redraw without bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1100 diff changeset	1051 -(int)redraw { return redraw; }
d7eafaa054ab Added support for dw_window_redraw() causing splitbar panes to redraw without bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1100 diff changeset	1052 -(void)setRedraw:(int)val { redraw = val; }
1489 4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	1053 -(int)shown { return shown; }
4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	1054 -(void)setShown:(int)val { shown = val; }
1862 9c7485b1921c Fixed object/signal/memory leak on Mac when destroying bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	1055 -(void)dealloc { dw_signal_disconnect_by_window(self); [super dealloc]; }
949 451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1056 @end
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1057
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1058 /* Subclass for a render area type */
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1059 @interface DWRender : NSControl
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1060 {
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1061 void *userdata;
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1062 NSFont *font;
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1063 NSSize size;
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1064 #ifdef BUILDING_FOR_MOJAVE
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1065 NSBitmapImageRep *cachedDrawingRep;
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1066 #endif
949 451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1067 }
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1068 -(void *)userdata;
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1069 -(void)setUserdata:(void *)input;
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1070 -(void)setFont:(NSFont *)input;
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1071 -(NSFont *)font;
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1072 -(void)setSize:(NSSize)input;
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1073 -(NSSize)size;
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1074 #ifdef BUILDING_FOR_MOJAVE
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1075 -(NSBitmapImageRep *)cachedDrawingRep;
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1076 #endif
949 451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1077 -(void)mouseDown:(NSEvent *)theEvent;
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1078 -(void)mouseUp:(NSEvent *)theEvent;
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1079 -(NSMenu )menuForEvent:(NSEvent )theEvent;
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1080 -(void)rightMouseUp:(NSEvent *)theEvent;
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1081 -(void)otherMouseDown:(NSEvent *)theEvent;
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1082 -(void)otherMouseUp:(NSEvent *)theEvent;
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1083 -(void)drawRect:(NSRect)rect;
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1084 -(void)keyDown:(NSEvent *)theEvent;
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1085 -(BOOL)isFlipped;
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1086 @end
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1087
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1088 @implementation DWRender
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1089 -(void *)userdata { return userdata; }
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1090 -(void)setUserdata:(void *)input { userdata = input; }
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1091 -(void)setFont:(NSFont *)input { [font release]; font = input; [font retain]; }
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1092 -(NSFont *)font { return font; }
1948 bbb1fb54f321 Mac: Need to retain the cached render bitmap and recreate it on resize on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1947 diff changeset	1093 -(void)setSize:(NSSize)input {
bbb1fb54f321 Mac: Need to retain the cached render bitmap and recreate it on resize on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1947 diff changeset	1094 size = input;
1949 c71e5da5b801 Mac: Fix mojave #ifdefs so it builds pre-mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1948 diff changeset	1095 #ifdef BUILDING_FOR_MOJAVE
1948 bbb1fb54f321 Mac: Need to retain the cached render bitmap and recreate it on resize on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1947 diff changeset	1096 if(cachedDrawingRep)
bbb1fb54f321 Mac: Need to retain the cached render bitmap and recreate it on resize on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1947 diff changeset	1097 {
bbb1fb54f321 Mac: Need to retain the cached render bitmap and recreate it on resize on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1947 diff changeset	1098 NSBitmapImageRep *oldrep = cachedDrawingRep;
bbb1fb54f321 Mac: Need to retain the cached render bitmap and recreate it on resize on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1947 diff changeset	1099 cachedDrawingRep = [self bitmapImageRepForCachingDisplayInRect:self.bounds];
bbb1fb54f321 Mac: Need to retain the cached render bitmap and recreate it on resize on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1947 diff changeset	1100 [cachedDrawingRep retain];
bbb1fb54f321 Mac: Need to retain the cached render bitmap and recreate it on resize on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1947 diff changeset	1101 [oldrep release];
bbb1fb54f321 Mac: Need to retain the cached render bitmap and recreate it on resize on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1947 diff changeset	1102 }
1949 c71e5da5b801 Mac: Fix mojave #ifdefs so it builds pre-mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1948 diff changeset	1103 #endif
1948 bbb1fb54f321 Mac: Need to retain the cached render bitmap and recreate it on resize on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1947 diff changeset	1104 }
949 451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1105 -(NSSize)size { return size; }
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1106 #ifdef BUILDING_FOR_MOJAVE
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1107 -(NSBitmapImageRep *)cachedDrawingRep {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1108 if(!cachedDrawingRep)
1948 bbb1fb54f321 Mac: Need to retain the cached render bitmap and recreate it on resize on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1947 diff changeset	1109 {
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1110 cachedDrawingRep = [self bitmapImageRepForCachingDisplayInRect:self.bounds];
1948 bbb1fb54f321 Mac: Need to retain the cached render bitmap and recreate it on resize on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1947 diff changeset	1111 [cachedDrawingRep retain];
bbb1fb54f321 Mac: Need to retain the cached render bitmap and recreate it on resize on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1947 diff changeset	1112 }
1954 85229fe9ae5a Mac: 10.14 doesn't like too many needsDisplays so instead we keep a list of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1953 diff changeset	1113 /* Mark this render dirty if something is requesting it to draw */
85229fe9ae5a Mac: 10.14 doesn't like too many needsDisplays so instead we keep a list of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1953 diff changeset	1114 if(![_DWDirtyDrawables containsObject:self])
85229fe9ae5a Mac: 10.14 doesn't like too many needsDisplays so instead we keep a list of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1953 diff changeset	1115 [_DWDirtyDrawables addObject:self];
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1116 return cachedDrawingRep;
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1117 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1118 #endif
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1119 -(void)mouseDown:(NSEvent *)theEvent
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1120 {
1940 38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	1121 if(![theEvent isMemberOfClass:[NSEvent class]] \|\| !([theEvent modifierFlags] & DWEventModifierFlagControl))
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1122 _event_handler(self, theEvent, 3);
1648 7a9b1189934a Another fix for Contol clicking on Mac... getting double events bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1647 diff changeset	1123 }
949 451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1124 -(void)mouseUp:(NSEvent *)theEvent { _event_handler(self, theEvent, 4); }
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1125 -(NSMenu )menuForEvent:(NSEvent )theEvent { _event_handler(self, theEvent, 3); return nil; }
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1126 -(void)rightMouseUp:(NSEvent *)theEvent { _event_handler(self, theEvent, 4); }
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1127 -(void)otherMouseDown:(NSEvent *)theEvent { _event_handler(self, theEvent, 3); }
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1128 -(void)otherMouseUp:(NSEvent *)theEvent { _event_handler(self, theEvent, 4); }
451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1129 -(void)mouseDragged:(NSEvent *)theEvent { _event_handler(self, theEvent, 5); }
2032 5ca399fb2d6f Mac: Put back the delayed setNeedsDisplay workaround for Mojave only. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2031 diff changeset	1130 -(void)delayedNeedsDisplay { [self setNeedsDisplay:YES]; }
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1131 -(void)drawRect:(NSRect)rect {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1132 _event_handler(self, nil, 7);
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1133 #ifdef BUILDING_FOR_MOJAVE
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1134 if (cachedDrawingRep)
1954 85229fe9ae5a Mac: 10.14 doesn't like too many needsDisplays so instead we keep a list of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1953 diff changeset	1135 {
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1136 [cachedDrawingRep drawInRect:self.bounds];
1954 85229fe9ae5a Mac: 10.14 doesn't like too many needsDisplays so instead we keep a list of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1953 diff changeset	1137 [_DWDirtyDrawables removeObject:self];
2032 5ca399fb2d6f Mac: Put back the delayed setNeedsDisplay workaround for Mojave only. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2031 diff changeset	1138 /* Work around a bug in Mojave 10.14 by delaying the setNeedsDisplay */
5ca399fb2d6f Mac: Put back the delayed setNeedsDisplay workaround for Mojave only. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2031 diff changeset	1139 if(DWOSMinor != 14)
5ca399fb2d6f Mac: Put back the delayed setNeedsDisplay workaround for Mojave only. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2031 diff changeset	1140 [self setNeedsDisplay:YES];
5ca399fb2d6f Mac: Put back the delayed setNeedsDisplay workaround for Mojave only. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2031 diff changeset	1141 else
5ca399fb2d6f Mac: Put back the delayed setNeedsDisplay workaround for Mojave only. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2031 diff changeset	1142 [self performSelector:@selector(delayedNeedsDisplay) withObject:nil afterDelay:0];
1954 85229fe9ae5a Mac: 10.14 doesn't like too many needsDisplays so instead we keep a list of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1953 diff changeset	1143 }
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1144 #endif
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1145 }
949 451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1146 -(void)keyDown:(NSEvent *)theEvent { _event_handler(self, theEvent, 2); }
954 cfb12bf3bb06 Fixes for some more coordinate system issues on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 953 diff changeset	1147 -(BOOL)isFlipped { return YES; }
1947 3aef9be654ce Mac: Fix pre-mojave build, cached render image not available. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1946 diff changeset	1148 -(void)dealloc {
3aef9be654ce Mac: Fix pre-mojave build, cached render image not available. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1946 diff changeset	1149 UserData *root = userdata;
3aef9be654ce Mac: Fix pre-mojave build, cached render image not available. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1946 diff changeset	1150 _remove_userdata(&root, NULL, TRUE);
3aef9be654ce Mac: Fix pre-mojave build, cached render image not available. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1946 diff changeset	1151 [font release];
3aef9be654ce Mac: Fix pre-mojave build, cached render image not available. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1946 diff changeset	1152 dw_signal_disconnect_by_window(self);
3aef9be654ce Mac: Fix pre-mojave build, cached render image not available. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1946 diff changeset	1153 #ifdef BUILDING_FOR_MOJAVE
3aef9be654ce Mac: Fix pre-mojave build, cached render image not available. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1946 diff changeset	1154 [cachedDrawingRep release];
1954 85229fe9ae5a Mac: 10.14 doesn't like too many needsDisplays so instead we keep a list of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1953 diff changeset	1155 [_DWDirtyDrawables removeObject:self];
1947 3aef9be654ce Mac: Fix pre-mojave build, cached render image not available. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1946 diff changeset	1156 #endif
3aef9be654ce Mac: Fix pre-mojave build, cached render image not available. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1946 diff changeset	1157 [super dealloc];
3aef9be654ce Mac: Fix pre-mojave build, cached render image not available. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1946 diff changeset	1158 }
949 451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1159 -(BOOL)acceptsFirstResponder { return YES; }
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	1160 @end
d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	1161
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1162 @implementation DWObject
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1163 -(void)uselessThread:(id)sender { /* Thread only to initialize threading */ }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	1164 #ifndef BUILDING_FOR_MOJAVE
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1165 -(void)synchronizeThread:(id)param
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1166 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1167 pthread_mutex_unlock(DWRunMutex);
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1168 pthread_mutex_lock(DWThreadMutex2);
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1169 pthread_mutex_unlock(DWThreadMutex2);
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1170 pthread_mutex_lock(DWRunMutex);
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1171 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	1172 #endif
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1173 -(void)menuHandler:(id)param
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1174 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1175 DWMenuItem *item = param;
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1176 if([item check])
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1177 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1178 if([item state] == DWControlStateValueOn)
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1179 [item setState:DWControlStateValueOff];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1180 else
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1181 [item setState:DWControlStateValueOn];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1182 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1183 _event_handler(param, nil, 8);
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1184 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	1185 #ifdef BUILDING_FOR_MOJAVE
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	1186 -(void)callBack:(NSPointerArray *)params
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	1187 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	1188 void (mycallback)(NSPointerArray ) = [params pointerAtIndex:0];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	1189 if(mycallback)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	1190 mycallback(params);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	1191 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	1192 #endif
1985 8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	1193 -(void)messageBox:(NSMutableArray *)params
8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	1194 {
8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	1195 NSInteger iResponse;
8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	1196 NSAlert *alert = [[NSAlert alloc] init];
8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	1197 [alert setMessageText:[params objectAtIndex:0]];
8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	1198 [alert setInformativeText:[params objectAtIndex:1]];
8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	1199 [alert addButtonWithTitle:[params objectAtIndex:3]];
8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	1200 if([params count] > 4)
8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	1201 [alert addButtonWithTitle:[params objectAtIndex:4]];
8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	1202 if([params count] > 5)
8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	1203 [alert addButtonWithTitle:[params objectAtIndex:5]];
8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	1204 [alert setAlertStyle:[[params objectAtIndex:2] integerValue]];
8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	1205 iResponse = [alert runModal];
8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	1206 [alert release];
8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	1207 [params addObject:[NSNumber numberWithInteger:iResponse]];
8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	1208 }
1953 77d156c3f01c Mac: Added a safeCall method to DWObject to make it easier to run things on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1952 diff changeset	1209 -(void)safeCall:(SEL)sel withObject:(id)param
77d156c3f01c Mac: Added a safeCall method to DWObject to make it easier to run things on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1952 diff changeset	1210 {
77d156c3f01c Mac: Added a safeCall method to DWObject to make it easier to run things on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1952 diff changeset	1211 if([self respondsToSelector:sel])
77d156c3f01c Mac: Added a safeCall method to DWObject to make it easier to run things on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1952 diff changeset	1212 {
77d156c3f01c Mac: Added a safeCall method to DWObject to make it easier to run things on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1952 diff changeset	1213 DWTID curr = pthread_self();
77d156c3f01c Mac: Added a safeCall method to DWObject to make it easier to run things on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1952 diff changeset	1214
77d156c3f01c Mac: Added a safeCall method to DWObject to make it easier to run things on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1952 diff changeset	1215 if(DWThread == (DWTID)-1 \|\| DWThread == curr)
77d156c3f01c Mac: Added a safeCall method to DWObject to make it easier to run things on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1952 diff changeset	1216 {
1993 e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	1217 DWIMP imp = (DWIMP)[self methodForSelector:sel];
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	1218
1953 77d156c3f01c Mac: Added a safeCall method to DWObject to make it easier to run things on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1952 diff changeset	1219 if(imp)
77d156c3f01c Mac: Added a safeCall method to DWObject to make it easier to run things on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1952 diff changeset	1220 imp(self, sel, param);
77d156c3f01c Mac: Added a safeCall method to DWObject to make it easier to run things on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1952 diff changeset	1221 }
77d156c3f01c Mac: Added a safeCall method to DWObject to make it easier to run things on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1952 diff changeset	1222 else
77d156c3f01c Mac: Added a safeCall method to DWObject to make it easier to run things on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1952 diff changeset	1223 [self performSelectorOnMainThread:sel withObject:param waitUntilDone:YES];
77d156c3f01c Mac: Added a safeCall method to DWObject to make it easier to run things on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1952 diff changeset	1224 }
77d156c3f01c Mac: Added a safeCall method to DWObject to make it easier to run things on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1952 diff changeset	1225 }
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1226 -(void)doBitBlt:(id)param
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1227 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1228 NSValue bi = (NSValue )param;
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1229 DWBitBlt bltinfo = (DWBitBlt )[bi pointerValue];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1230 id bltdest = bltinfo->dest;
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1231 id bltsrc = bltinfo->src;
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	1232
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1233 #ifdef BUILDING_FOR_MOJAVE
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1234 if([bltdest isMemberOfClass:[DWRender class]])
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1235 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1236 DWRender *render = bltdest;
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	1237
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1238 bltdest = [render cachedDrawingRep];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1239 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1240 #endif
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1241 if([bltdest isMemberOfClass:[NSBitmapImageRep class]])
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1242 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1243 [NSGraphicsContext saveGraphicsState];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1244 [NSGraphicsContext setCurrentContext:_dw_draw_context(bltdest)];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1245 [[[NSDictionary alloc] initWithObjectsAndKeys:bltdest, NSGraphicsContextDestinationAttributeName, nil] autorelease];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1246 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1247 #ifndef BUILDING_FOR_MOJAVE
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1248 else
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1249 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1250 if([bltdest lockFocusIfCanDraw] == NO)
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1251 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1252 free(bltinfo);
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1253 return;
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1254 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1255 _DWLastDrawable = bltinfo->dest;
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1256 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1257 #endif
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1258 if([bltsrc isMemberOfClass:[NSBitmapImageRep class]])
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1259 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1260 NSBitmapImageRep *rep = bltsrc;
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1261 NSImage *image = [NSImage alloc];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1262 SEL siwc = NSSelectorFromString(@"initWithCGImage");
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1263 NSCompositingOperation op = DWCompositingOperationSourceOver;
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	1264
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1265 if([image respondsToSelector:siwc])
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1266 {
1993 e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	1267 DWIMP iiwc = (DWIMP)[image methodForSelector:siwc];
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1268 image = iiwc(image, siwc, [rep CGImage], NSZeroSize);
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1269 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1270 else
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1271 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1272 image = [image initWithSize:[rep size]];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1273 [image addRepresentation:rep];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1274 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1275 if(bltinfo->srcwidth != -1)
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1276 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1277 [image drawInRect:NSMakeRect(bltinfo->xdest, bltinfo->ydest, bltinfo->width, bltinfo->height)
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1278 fromRect:NSMakeRect(bltinfo->xsrc, bltinfo->ysrc, bltinfo->srcwidth, bltinfo->srcheight)
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1279 operation:op fraction:1.0];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1280 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1281 else
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1282 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1283 [image drawAtPoint:NSMakePoint(bltinfo->xdest, bltinfo->ydest)
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1284 fromRect:NSMakeRect(bltinfo->xsrc, bltinfo->ysrc, bltinfo->width, bltinfo->height)
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1285 operation:op fraction:1.0];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1286 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1287 [bltsrc release];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1288 [image release];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1289 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1290 if([bltdest isMemberOfClass:[NSBitmapImageRep class]])
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1291 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1292 [NSGraphicsContext restoreGraphicsState];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1293 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1294 #ifndef BUILDING_FOR_MOJAVE
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1295 else
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1296 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1297 [bltdest unlockFocus];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1298 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1299 #endif
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1300 free(bltinfo);
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1301 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1302 -(void)doFlush:(id)param
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1303 {
1954 85229fe9ae5a Mac: 10.14 doesn't like too many needsDisplays so instead we keep a list of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1953 diff changeset	1304 #ifdef BUILDING_FOR_MOJAVE
85229fe9ae5a Mac: 10.14 doesn't like too many needsDisplays so instead we keep a list of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1953 diff changeset	1305 NSEnumerator *enumerator = [_DWDirtyDrawables objectEnumerator];
85229fe9ae5a Mac: 10.14 doesn't like too many needsDisplays so instead we keep a list of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1953 diff changeset	1306 DWRender *rend;
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	1307
1954 85229fe9ae5a Mac: 10.14 doesn't like too many needsDisplays so instead we keep a list of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1953 diff changeset	1308 while (rend = [enumerator nextObject])
2031 c4fc33d70a8e Mac: Removed delayed setNeedsDisplay:YES to fix the incorrect dwtest file bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2023 diff changeset	1309 [rend setNeedsDisplay:YES];
1954 85229fe9ae5a Mac: 10.14 doesn't like too many needsDisplays so instead we keep a list of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1953 diff changeset	1310 [_DWDirtyDrawables removeAllObjects];
85229fe9ae5a Mac: 10.14 doesn't like too many needsDisplays so instead we keep a list of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1953 diff changeset	1311 #else
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1312 if(_DWLastDrawable)
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1313 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1314 id object = _DWLastDrawable;
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1315 NSWindow *window = [object window];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1316 [window flushWindow];
1954 85229fe9ae5a Mac: 10.14 doesn't like too many needsDisplays so instead we keep a list of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1953 diff changeset	1317 _DWLastDrawable = nil;
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1318 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1319 #endif
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1320 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1321 -(void)doWindowFunc:(id)param
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1322 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1323 NSValue v = (NSValue )param;
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1324 void params = (void )[v pointerValue];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1325 void (* windowfunc)(void *);
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	1326
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1327 if(params)
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1328 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1329 windowfunc = params[0];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1330 if(windowfunc)
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1331 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1332 windowfunc(params[1]);
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1333 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1334 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1335 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1336 @end
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1337
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1338 DWObject *DWObj;
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1339
1843 2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	1340 /* Subclass for the application class */
2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	1341 @interface DWAppDel : NSObject
2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	1342 #ifdef BUILDING_FOR_SNOW_LEOPARD
2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	1343 <NSApplicationDelegate>
2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	1344 #endif
2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	1345 {
2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	1346 }
2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	1347 -(NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender;
2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	1348 @end
2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	1349
2013 7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1350 /* Apparently the WKWebKit API is only enabled on intel 64bit...
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1351 * Causing build failures on 32bit builds, so this should allow
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1352 * WKWebKit on intel 64 and the old WebKit on intel 32 bit and earlier.
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1353 */
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1354 #if WK_API_ENABLED
2023 3f265cd5b069 Mac: Added cleanup to the DWWebView subclasses and userdata for dw_window_set_data() on it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2020 diff changeset	1355 @interface DWWebView : WKWebView <WKNavigationDelegate>
3f265cd5b069 Mac: Added cleanup to the DWWebView subclasses and userdata for dw_window_set_data() on it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2020 diff changeset	1356 {
3f265cd5b069 Mac: Added cleanup to the DWWebView subclasses and userdata for dw_window_set_data() on it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2020 diff changeset	1357 void *userdata;
3f265cd5b069 Mac: Added cleanup to the DWWebView subclasses and userdata for dw_window_set_data() on it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2020 diff changeset	1358 }
3f265cd5b069 Mac: Added cleanup to the DWWebView subclasses and userdata for dw_window_set_data() on it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2020 diff changeset	1359 -(void *)userdata;
3f265cd5b069 Mac: Added cleanup to the DWWebView subclasses and userdata for dw_window_set_data() on it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2020 diff changeset	1360 -(void)setUserdata:(void *)input;
2013 7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1361 -(void)webView:(WKWebView )webView didCommitNavigation:(WKNavigation )navigation;
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1362 -(void)webView:(WKWebView )webView didFinishNavigation:(WKNavigation )navigation;
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1363 -(void)webView:(WKWebView )webView didStartProvisionalNavigation:(WKNavigation )navigation;
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1364 -(void)webView:(WKWebView )webView didReceiveServerRedirectForProvisionalNavigation:(WKNavigation )navigation;
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1365 @end
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1366
2023 3f265cd5b069 Mac: Added cleanup to the DWWebView subclasses and userdata for dw_window_set_data() on it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2020 diff changeset	1367 @implementation DWWebView : WKWebView
3f265cd5b069 Mac: Added cleanup to the DWWebView subclasses and userdata for dw_window_set_data() on it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2020 diff changeset	1368 -(void *)userdata { return userdata; }
3f265cd5b069 Mac: Added cleanup to the DWWebView subclasses and userdata for dw_window_set_data() on it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2020 diff changeset	1369 -(void)setUserdata:(void *)input { userdata = input; }
2013 7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1370 -(void)webView:(WKWebView )webView didCommitNavigation:(WKNavigation )navigation
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1371 {
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1372 void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_STARTED), [[self URL] absoluteString] };
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1373 _event_handler(self, (NSEvent *)params, 19);
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1374 }
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1375 -(void)webView:(WKWebView )webView didFinishNavigation:(WKNavigation )navigation
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1376 {
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1377 void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_COMPLETE), [[self URL] absoluteString] };
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1378 _event_handler(self, (NSEvent *)params, 19);
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1379 }
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1380 -(void)webView:(WKWebView )webView didStartProvisionalNavigation:(WKNavigation )navigation
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1381 {
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1382 void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_LOADING), [[self URL] absoluteString] };
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1383 _event_handler(self, (NSEvent *)params, 19);
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1384 }
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1385 -(void)webView:(WKWebView )webView didReceiveServerRedirectForProvisionalNavigation:(WKNavigation )navigation
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1386 {
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1387 void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_REDIRECT), [[self URL] absoluteString] };
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1388 _event_handler(self, (NSEvent *)params, 19);
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1389 }
2023 3f265cd5b069 Mac: Added cleanup to the DWWebView subclasses and userdata for dw_window_set_data() on it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2020 diff changeset	1390 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
2013 7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1391 @end
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1392 #else
2014 b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1393 @interface DWWebView : WebView
2023 3f265cd5b069 Mac: Added cleanup to the DWWebView subclasses and userdata for dw_window_set_data() on it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2020 diff changeset	1394 {
3f265cd5b069 Mac: Added cleanup to the DWWebView subclasses and userdata for dw_window_set_data() on it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2020 diff changeset	1395 void *userdata;
3f265cd5b069 Mac: Added cleanup to the DWWebView subclasses and userdata for dw_window_set_data() on it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2020 diff changeset	1396 }
3f265cd5b069 Mac: Added cleanup to the DWWebView subclasses and userdata for dw_window_set_data() on it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2020 diff changeset	1397 -(void *)userdata;
3f265cd5b069 Mac: Added cleanup to the DWWebView subclasses and userdata for dw_window_set_data() on it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2020 diff changeset	1398 -(void)setUserdata:(void *)input;
2014 b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1399 -(void)webView:(WebView )sender didFinishLoadForFrame:(WebFrame )frame;
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1400 -(void)webView:(WebView )sender didCommitLoadForFrame:(WebFrame )frame;
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1401 -(void)webView:(WebView )sender didStartProvisionalLoadForFrame:(WebFrame )frame;
2013 7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1402 @end
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1403
2023 3f265cd5b069 Mac: Added cleanup to the DWWebView subclasses and userdata for dw_window_set_data() on it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2020 diff changeset	1404 @implementation DWWebView : WebView
3f265cd5b069 Mac: Added cleanup to the DWWebView subclasses and userdata for dw_window_set_data() on it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2020 diff changeset	1405 -(void *)userdata { return userdata; }
3f265cd5b069 Mac: Added cleanup to the DWWebView subclasses and userdata for dw_window_set_data() on it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2020 diff changeset	1406 -(void)setUserdata:(void *)input { userdata = input; }
2014 b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1407 -(void)webView:(WebView )sender didFinishLoadForFrame:(WebFrame )frame
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1408 {
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1409 void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_COMPLETE), [self mainFrameURL] };
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1410 _event_handler(self, (NSEvent *)params, 19);
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1411 }
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1412 -(void)webView:(WebView )sender didCommitLoadForFrame:(WebFrame )frame
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1413 {
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1414 void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_STARTED), [self mainFrameURL] };
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1415 _event_handler(self, (NSEvent *)params, 19);
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1416 }
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1417 -(void)webView:(WebView )sender didStartProvisionalLoadForFrame:(WebFrame )frame
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1418 {
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1419 void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_LOADING), [self mainFrameURL] };
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1420 _event_handler(self, (NSEvent *)params, 19);
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1421 }
2023 3f265cd5b069 Mac: Added cleanup to the DWWebView subclasses and userdata for dw_window_set_data() on it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2020 diff changeset	1422 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
2013 7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1423 @end
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1424 #endif
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1425
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1426
1843 2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	1427 @implementation DWAppDel
2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	1428 -(NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	1429 {
2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	1430 if(_event_handler(sender, nil, 6) > 0)
2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	1431 return NSTerminateCancel;
2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	1432 return NSTerminateNow;
2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	1433 }
2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	1434 @end
2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	1435
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1436 /* Subclass for a top-level window */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1437 @interface DWView : DWBox
854 d44bb4c4902d Fixed an error on the close event handler on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 853 diff changeset	1438 #ifdef BUILDING_FOR_SNOW_LEOPARD
d44bb4c4902d Fixed an error on the close event handler on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 853 diff changeset	1439 <NSWindowDelegate>
d44bb4c4902d Fixed an error on the close event handler on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 853 diff changeset	1440 #endif
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1441 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1442 NSMenu *windowmenu;
916 44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1443 NSSize oldsize;
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1444 }
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1445 -(BOOL)windowShouldClose:(id)sender;
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1446 -(void)setMenu:(NSMenu *)input;
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1447 -(void)windowDidBecomeMain:(id)sender;
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1448 -(void)menuHandler:(id)sender;
932 ed10b5284f36 Fixes for dw_window_capture(), dw_window_release() and motion notify events on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 931 diff changeset	1449 -(void)mouseDragged:(NSEvent *)theEvent;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1450 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1451
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1452 @implementation DWView
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1453 -(BOOL)windowShouldClose:(id)sender
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1454 {
1018 a943f973c3ff If there is no close event handler, the window should close by default on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 992 diff changeset	1455 if(_event_handler(sender, nil, 6) > 0)
a943f973c3ff If there is no close event handler, the window should close by default on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 992 diff changeset	1456 return NO;
a943f973c3ff If there is no close event handler, the window should close by default on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 992 diff changeset	1457 return YES;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1458 }
1862 9c7485b1921c Fixed object/signal/memory leak on Mac when destroying bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	1459 -(void)viewDidMoveToWindow
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1460 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1461 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowResized:) name:NSWindowDidResizeNotification object:[self window]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1462 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidBecomeMain:) name:NSWindowDidBecomeMainNotification object:[self window]];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1463 }
1862 9c7485b1921c Fixed object/signal/memory leak on Mac when destroying bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	1464 -(void)dealloc
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1465 {
736 5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	1466 if(windowmenu)
5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	1467 {
5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	1468 [windowmenu release];
5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	1469 }
5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	1470 [[NSNotificationCenter defaultCenter] removeObserver:self];
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	1471 dw_signal_disconnect_by_window(self);
736 5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	1472 [super dealloc];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1473 }
1862 9c7485b1921c Fixed object/signal/memory leak on Mac when destroying bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	1474 -(void)windowResized:(NSNotification *)notification;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1475 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1476 NSSize size = [self frame].size;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1477
916 44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1478 if(oldsize.width != size.width \|\| oldsize.height != size.height)
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1479 {
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1480 _do_resize(box, size.width, size.height);
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1481 _event_handler([self window], nil, 1);
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1482 oldsize.width = size.width;
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1483 oldsize.height = size.height;
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1484 _handle_resize_events(box);
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1485 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1486 }
930 b6ee515cad8a When getting dw_window_show() called on an unresized window... trigger a relayout on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 929 diff changeset	1487 -(void)showWindow
b6ee515cad8a When getting dw_window_show() called on an unresized window... trigger a relayout on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 929 diff changeset	1488 {
b6ee515cad8a When getting dw_window_show() called on an unresized window... trigger a relayout on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 929 diff changeset	1489 NSSize size = [self frame].size;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1490
930 b6ee515cad8a When getting dw_window_show() called on an unresized window... trigger a relayout on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 929 diff changeset	1491 if(oldsize.width == size.width && oldsize.height == size.height)
b6ee515cad8a When getting dw_window_show() called on an unresized window... trigger a relayout on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 929 diff changeset	1492 {
b6ee515cad8a When getting dw_window_show() called on an unresized window... trigger a relayout on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 929 diff changeset	1493 _do_resize(box, size.width, size.height);
b6ee515cad8a When getting dw_window_show() called on an unresized window... trigger a relayout on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 929 diff changeset	1494 _handle_resize_events(box);
b6ee515cad8a When getting dw_window_show() called on an unresized window... trigger a relayout on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 929 diff changeset	1495 }
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1496
930 b6ee515cad8a When getting dw_window_show() called on an unresized window... trigger a relayout on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 929 diff changeset	1497 }
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1498 -(void)windowDidBecomeMain:(id)sender
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1499 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1500 if(windowmenu)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1501 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1502 [DWApp setMainMenu:windowmenu];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1503 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1504 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1505 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1506 [DWApp setMainMenu:DWMainMenu];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1507 }
1026 f15dc5226c35 Fixed focus event was getting ignored because wrong handle passed to the event handler on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1023 diff changeset	1508 _event_handler([self window], nil, 13);
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1509 }
736 5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	1510 -(void)setMenu:(NSMenu *)input { windowmenu = input; [windowmenu retain]; }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1511 -(void)menuHandler:(id)sender
1593 19af25f71e1f Yet another fix attempt for mene item issues on Mac 10.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1590 diff changeset	1512 {
19af25f71e1f Yet another fix attempt for mene item issues on Mac 10.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1590 diff changeset	1513 id menu = [sender menu];
19af25f71e1f Yet another fix attempt for mene item issues on Mac 10.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1590 diff changeset	1514
19af25f71e1f Yet another fix attempt for mene item issues on Mac 10.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1590 diff changeset	1515 /* Find the highest menu for this item */
19af25f71e1f Yet another fix attempt for mene item issues on Mac 10.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1590 diff changeset	1516 while([menu supermenu])
19af25f71e1f Yet another fix attempt for mene item issues on Mac 10.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1590 diff changeset	1517 {
19af25f71e1f Yet another fix attempt for mene item issues on Mac 10.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1590 diff changeset	1518 menu = [menu supermenu];
19af25f71e1f Yet another fix attempt for mene item issues on Mac 10.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1590 diff changeset	1519 }
19af25f71e1f Yet another fix attempt for mene item issues on Mac 10.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1590 diff changeset	1520
19af25f71e1f Yet another fix attempt for mene item issues on Mac 10.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1590 diff changeset	1521 /* Only perform the delay if this item is a child of the main menu */
19af25f71e1f Yet another fix attempt for mene item issues on Mac 10.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1590 diff changeset	1522 if([DWApp mainMenu] == menu)
19af25f71e1f Yet another fix attempt for mene item issues on Mac 10.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1590 diff changeset	1523 [DWObj performSelector:@selector(menuHandler:) withObject:sender afterDelay:0];
19af25f71e1f Yet another fix attempt for mene item issues on Mac 10.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1590 diff changeset	1524 else
19af25f71e1f Yet another fix attempt for mene item issues on Mac 10.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1590 diff changeset	1525 [DWObj menuHandler:sender];
1558 9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	1526 _dw_wakeup_app();
1522 c98b2ce2d5b2 Fix menuHandler not being called until an event on Mac 10.5. This reinstitutes the menu display bug on Leopard but that is only a cosmetic issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1517 diff changeset	1527 }
949 451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1528 -(void)mouseDragged:(NSEvent *)theEvent { _event_handler(self, theEvent, 5); }
952 abb9203adc05 Use NSCompositeSourceOver for bitblting that respects transparency of the source mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 951 diff changeset	1529 -(void)mouseMoved:(NSEvent *)theEvent
abb9203adc05 Use NSCompositeSourceOver for bitblting that respects transparency of the source mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 951 diff changeset	1530 {
944 cdb7a53e5515 Some motion notify changes... so it can handle events without the mouse button pressed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 943 diff changeset	1531 id hit = [self hitTest:[theEvent locationInWindow]];
952 abb9203adc05 Use NSCompositeSourceOver for bitblting that respects transparency of the source mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 951 diff changeset	1532
949 451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1533 if([hit isMemberOfClass:[DWRender class]])
952 abb9203adc05 Use NSCompositeSourceOver for bitblting that respects transparency of the source mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 951 diff changeset	1534 {
abb9203adc05 Use NSCompositeSourceOver for bitblting that respects transparency of the source mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 951 diff changeset	1535 _event_handler(hit, theEvent, 5);
949 451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	1536 }
944 cdb7a53e5515 Some motion notify changes... so it can handle events without the mouse button pressed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 943 diff changeset	1537 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1538 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1539
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1540 /* Subclass for a button type */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1541 @interface DWButton : NSButton
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1542 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1543 void *userdata;
793 e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1544 NSButtonType buttonType;
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1545 DWBox *parent;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1546 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1547 -(void *)userdata;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1548 -(void)setUserdata:(void *)input;
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1549 -(void)buttonClicked:(id)sender;
793 e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1550 -(void)setButtonType:(NSButtonType)input;
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1551 -(NSButtonType)buttonType;
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1552 -(void)setParent:(DWBox *)input;
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1553 -(DWBox *)parent;
1849 b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1554 -(NSColor *)textColor;
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1555 -(void)setTextColor:(NSColor *)textColor;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1556 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1557
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1558 @implementation DWButton
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1559 -(void *)userdata { return userdata; }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1560 -(void)setUserdata:(void *)input { userdata = input; }
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1561 -(void)buttonClicked:(id)sender
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1562 {
793 e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1563 _event_handler(self, nil, 8);
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	1564 if([self buttonType] == DWButtonTypeRadio)
793 e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1565 {
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1566 DWBox *viewbox = [self parent];
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1567 Box *thisbox = [viewbox box];
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1568 int z;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1569
793 e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1570 for(z=0;z<thisbox->count;z++)
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1571 {
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1572 if(thisbox->items[z].type != TYPEBOX)
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1573 {
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1574 id object = thisbox->items[z].hwnd;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1575
793 e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1576 if([object isMemberOfClass:[DWButton class]])
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1577 {
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1578 DWButton *button = object;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1579
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	1580 if(button != self && [button buttonType] == DWButtonTypeRadio)
793 e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1581 {
1938 5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	1582 [button setState:DWControlStateValueOff];
793 e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1583 }
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1584 }
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1585 }
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1586 }
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1587 }
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1588 }
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1589 -(void)setButtonType:(NSButtonType)input { buttonType = input; [super setButtonType:input]; }
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1590 -(NSButtonType)buttonType { return buttonType; }
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1591 -(void)setParent:(DWBox *)input { parent = input; }
e328c7746cda Basic code to handle unchecking other radio buttons attached to the same box when one is selected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 792 diff changeset	1592 -(DWBox *)parent { return parent; }
1849 b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1593 -(NSColor *)textColor
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1594 {
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1595 NSAttributedString *attrTitle = [self attributedTitle];
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1596 NSUInteger len = [attrTitle length];
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1597 NSRange range = NSMakeRange(0, MIN(len, 1));
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1598 NSDictionary *attrs = [attrTitle fontAttributesInRange:range];
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1599 NSColor *textColor = [NSColor controlTextColor];
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1600 if (attrs) {
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1601 textColor = [attrs objectForKey:NSForegroundColorAttributeName];
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1602 }
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1603 return textColor;
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1604 }
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1605 -(void)setTextColor:(NSColor *)textColor
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1606 {
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1607 NSMutableAttributedString *attrTitle = [[NSMutableAttributedString alloc]
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1608 initWithAttributedString:[self attributedTitle]];
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1609 NSUInteger len = [attrTitle length];
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1610 NSRange range = NSMakeRange(0, len);
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1611 [attrTitle addAttribute:NSForegroundColorAttributeName
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1612 value:textColor
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1613 range:range];
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1614 [attrTitle fixAttributesInRange:range];
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1615 [self setAttributedTitle:attrTitle];
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1616 [attrTitle release];
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1617 }
1806 eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	1618 -(void)keyDown:(NSEvent *)theEvent
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	1619 {
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	1620 unichar vk = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	1621 if(vk == VK_RETURN \|\| vk == VK_SPACE)
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	1622 {
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	1623 if(buttonType == DWButtonTypeSwitch)
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	1624 [self setState:([self state] ? DWControlStateValueOff : DWControlStateValueOn)];
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	1625 else if(buttonType == DWButtonTypeRadio)
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	1626 [self setState:DWControlStateValueOn];
1806 eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	1627 [self buttonClicked:self];
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	1628 }
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	1629 else
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	1630 {
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	1631 [self interpretKeyEvents:[NSArray arrayWithObject:theEvent]];
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	1632 [super keyDown:theEvent];
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	1633 }
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	1634 }
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	1635 -(void)insertTab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectNextKeyView:self]; }
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	1636 -(void)insertBacktab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectPreviousKeyView:self]; }
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	1637 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1638 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1639
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1640 /* Subclass for a progress type */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1641 @interface DWPercent : NSProgressIndicator
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1642 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1643 void *userdata;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1644 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1645 -(void *)userdata;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1646 -(void)setUserdata:(void *)input;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1647 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1648
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1649 @implementation DWPercent
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1650 -(void *)userdata { return userdata; }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1651 -(void)setUserdata:(void *)input { userdata = input; }
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	1652 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	1653 @end
c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	1654
c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	1655 /* Subclass for a menu item type */
c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	1656 @implementation DWMenuItem
1517 6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	1657 -(void)setCheck:(int)input { check = input; }
6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	1658 -(int)check { return check; }
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	1659 -(void)dealloc { dw_signal_disconnect_by_window(self); [super dealloc]; }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1660 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1661
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	1662 /* Subclass for a scrollbox type */
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	1663 @interface DWScrollBox : NSScrollView
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	1664 {
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	1665 void *userdata;
840 2967934fb587 Implemented the fix for the scrollbox problem on the Mac (that was discovered on Windows) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 838 diff changeset	1666 id box;
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	1667 }
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	1668 -(void *)userdata;
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	1669 -(void)setUserdata:(void *)input;
840 2967934fb587 Implemented the fix for the scrollbox problem on the Mac (that was discovered on Windows) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 838 diff changeset	1670 -(void)setBox:(void *)input;
2967934fb587 Implemented the fix for the scrollbox problem on the Mac (that was discovered on Windows) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 838 diff changeset	1671 -(id)box;
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	1672 @end
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	1673
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	1674 @implementation DWScrollBox
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	1675 -(void *)userdata { return userdata; }
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	1676 -(void)setUserdata:(void *)input { userdata = input; }
840 2967934fb587 Implemented the fix for the scrollbox problem on the Mac (that was discovered on Windows) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 838 diff changeset	1677 -(void)setBox:(void *)input { box = input; }
2967934fb587 Implemented the fix for the scrollbox problem on the Mac (that was discovered on Windows) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 838 diff changeset	1678 -(id)box { return box; }
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	1679 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	1680 @end
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	1681
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1682 /* Subclass for a textfield that supports vertical centering */
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1683 @interface DWTextFieldCell : NSTextFieldCell
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1684 {
860 93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	1685 BOOL vcenter;
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1686 }
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1687 -(NSRect)drawingRectForBounds:(NSRect)theRect;
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1688 -(void)setVCenter:(BOOL)input;
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1689 @end
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1690
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1691 @implementation DWTextFieldCell
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1692 -(NSRect)drawingRectForBounds:(NSRect)theRect
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1693 {
860 93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	1694 /* Get the parent's idea of where we should draw */
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	1695 NSRect newRect = [super drawingRectForBounds:theRect];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1696
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1697 /* If we are being vertically centered */
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1698 if(vcenter)
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1699 {
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1700 /* Get our ideal size for current text */
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1701 NSSize textSize = [self cellSizeForBounds:theRect];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1702
860 93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	1703 /* Center that in the proposed rect */
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	1704 float heightDelta = newRect.size.height - textSize.height;
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	1705 if (heightDelta > 0)
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	1706 {
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	1707 newRect.size.height -= heightDelta;
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	1708 newRect.origin.y += (heightDelta / 2);
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	1709 }
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	1710 }
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1711
860 93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	1712 return newRect;
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1713 }
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1714 -(void)setVCenter:(BOOL)input { vcenter = input; }
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1715 @end
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1716
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1717 @interface DWEntryFieldFormatter : NSFormatter
887 29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1718 {
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1719 int maxLength;
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1720 }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1721 - (void)setMaximumLength:(int)len;
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1722 - (int)maximumLength;
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1723 @end
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1724
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1725 /* This formatter subclass will allow us to limit
887 29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1726 * the text length in an entryfield.
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1727 */
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1728 @implementation DWEntryFieldFormatter
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1729 -(id)init
887 29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1730 {
1063 2ebaea72ac95 Fix for some release calls causing issues on MacOS 10.7 Lion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1061 diff changeset	1731 self = [super init];
887 29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1732 maxLength = INT_MAX;
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1733 return self;
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1734 }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1735 -(void)setMaximumLength:(int)len { maxLength = len; }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1736 -(int)maximumLength { return maxLength; }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1737 -(NSString )stringForObjectValue:(id)object { return (NSString )object; }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1738 -(BOOL)getObjectValue:(id )object forString:(NSString )string errorDescription:(NSString *)error { object = string; return YES; }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1739 -(BOOL)isPartialStringValid:(NSString **)partialStringPtr
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1740 proposedSelectedRange:(NSRangePointer)proposedSelRangePtr
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1741 originalString:(NSString *)origString
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1742 originalSelectedRange:(NSRange)origSelRange
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1743 errorDescription:(NSString **)error
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1744 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1745 if([*partialStringPtr length] > maxLength)
887 29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1746 {
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1747 return NO;
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1748 }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1749 return YES;
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1750 }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1751 -(NSAttributedString )attributedStringForObjectValue:(id)anObject withDefaultAttributes:(NSDictionary )attributes { return nil; }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1752 @end
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1753
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1754 /* Subclass for a entryfield type */
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1755 @interface DWEntryField : NSTextField
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1756 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1757 void *userdata;
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1758 id clickDefault;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1759 }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1760 -(void *)userdata;
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1761 -(void)setUserdata:(void *)input;
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1762 -(void)setClickDefault:(id)input;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1763 @end
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1764
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1765 @implementation DWEntryField
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1766 -(void *)userdata { return userdata; }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1767 -(void)setUserdata:(void *)input { userdata = input; }
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1768 -(void)setClickDefault:(id)input { clickDefault = input; }
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1769 -(void)keyUp:(NSEvent *)theEvent
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1770 {
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1771 unichar vk = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1772 if(clickDefault && vk == VK_RETURN)
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1773 {
1236 46de4dbe710d Fixed clickdefault not triggering event for buttons on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1235 diff changeset	1774 if([clickDefault isKindOfClass:[NSButton class]])
46de4dbe710d Fixed clickdefault not triggering event for buttons on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1235 diff changeset	1775 [clickDefault buttonClicked:self];
46de4dbe710d Fixed clickdefault not triggering event for buttons on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1235 diff changeset	1776 else
46de4dbe710d Fixed clickdefault not triggering event for buttons on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1235 diff changeset	1777 [[self window] makeFirstResponder:clickDefault];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1778 } else
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1779 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1780 [super keyUp:theEvent];
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1781 }
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1782 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1783 -(BOOL)performKeyEquivalent:(NSEvent *)theEvent
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1784 {
1940 38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	1785 if(([theEvent modifierFlags] & DWEventModifierFlagDeviceIndependentFlagsMask) == DWEventModifierFlagCommand)
1235 9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1786 {
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1787 if ([[theEvent charactersIgnoringModifiers] isEqualToString:@"x"])
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1788 return [NSApp sendAction:@selector(cut:) to:[[self window] firstResponder] from:self];
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1789 else if ([[theEvent charactersIgnoringModifiers] isEqualToString:@"c"])
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1790 return [NSApp sendAction:@selector(copy:) to:[[self window] firstResponder] from:self];
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1791 else if ([[theEvent charactersIgnoringModifiers] isEqualToString:@"v"])
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1792 return [NSApp sendAction:@selector(paste:) to:[[self window] firstResponder] from:self];
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1793 else if ([[theEvent charactersIgnoringModifiers] isEqualToString:@"a"])
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1794 return [NSApp sendAction:@selector(selectAll:) to:[[self window] firstResponder] from:self];
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1795 }
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1796 return [super performKeyEquivalent:theEvent];
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1797 }
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	1798 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1799 @end
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1800
1564 d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1801 /* Subclass for a text and status text type */
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1802 @interface DWText : NSTextField
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1803 {
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1804 void *userdata;
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1805 id clickDefault;
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1806 }
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1807 -(void *)userdata;
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1808 -(void)setUserdata:(void *)input;
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1809 @end
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1810
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1811 @implementation DWText
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1812 -(void *)userdata { return userdata; }
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1813 -(void)setUserdata:(void *)input { userdata = input; }
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1814 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; }
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1815 @end
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1816
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1817
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1818 /* Subclass for a entryfield password type */
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1819 @interface DWEntryFieldPassword : NSSecureTextField
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1820 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1821 void *userdata;
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1822 id clickDefault;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1823 }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1824 -(void *)userdata;
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1825 -(void)setUserdata:(void *)input;
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1826 -(void)setClickDefault:(id)input;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1827 @end
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1828
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1829 @implementation DWEntryFieldPassword
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1830 -(void *)userdata { return userdata; }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1831 -(void)setUserdata:(void *)input { userdata = input; }
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1832 -(void)setClickDefault:(id)input { clickDefault = input; }
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1833 -(void)keyUp:(NSEvent *)theEvent
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1834 {
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1835 if(clickDefault && [[theEvent charactersIgnoringModifiers] characterAtIndex:0] == VK_RETURN)
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1836 {
1236 46de4dbe710d Fixed clickdefault not triggering event for buttons on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1235 diff changeset	1837 if([clickDefault isKindOfClass:[NSButton class]])
46de4dbe710d Fixed clickdefault not triggering event for buttons on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1235 diff changeset	1838 [clickDefault buttonClicked:self];
46de4dbe710d Fixed clickdefault not triggering event for buttons on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1235 diff changeset	1839 else
46de4dbe710d Fixed clickdefault not triggering event for buttons on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1235 diff changeset	1840 [[self window] makeFirstResponder:clickDefault];
1235 9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1841 }
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1842 else
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1843 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1844 [super keyUp:theEvent];
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1845 }
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	1846 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1847 -(BOOL)performKeyEquivalent:(NSEvent *)theEvent
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1848 {
1983 59146d14e21e Mac: Fix building for MacOS 10.10 Yosemite. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1974 diff changeset	1849 if(([theEvent modifierFlags] & DWEventModifierFlagDeviceIndependentFlagsMask) == DWEventModifierFlagCommand)
1235 9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1850 {
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1851 if ([[theEvent charactersIgnoringModifiers] isEqualToString:@"x"])
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1852 return [NSApp sendAction:@selector(cut:) to:[[self window] firstResponder] from:self];
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1853 else if ([[theEvent charactersIgnoringModifiers] isEqualToString:@"c"])
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1854 return [NSApp sendAction:@selector(copy:) to:[[self window] firstResponder] from:self];
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1855 else if ([[theEvent charactersIgnoringModifiers] isEqualToString:@"v"])
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1856 return [NSApp sendAction:@selector(paste:) to:[[self window] firstResponder] from:self];
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1857 else if ([[theEvent charactersIgnoringModifiers] isEqualToString:@"a"])
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1858 return [NSApp sendAction:@selector(selectAll:) to:[[self window] firstResponder] from:self];
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1859 }
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1860 return [super performKeyEquivalent:theEvent];
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1861 }
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	1862 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1863 @end
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1864
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1865 /* Subclass for a Notebook control type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1866 @interface DWNotebook : NSTabView
719 d5e49ef8f541 Updated the #if for Snow Leopard/Leopard builds to handle them not being defined properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 718 diff changeset	1867 #ifdef BUILDING_FOR_SNOW_LEOPARD
717 17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	1868 <NSTabViewDelegate>
17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	1869 #endif
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1870 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1871 void *userdata;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1872 int pageid;
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1873 }
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1874 -(void *)userdata;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1875 -(void)setUserdata:(void *)input;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1876 -(int)pageid;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1877 -(void)setPageid:(int)input;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1878 -(void)tabView:(NSTabView )notebook didSelectTabViewItem:(NSTabViewItem )notepage;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1879 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1880
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1881 /* Subclass for a Notebook page type */
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1882 @interface DWNotebookPage : NSTabViewItem
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1883 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1884 void *userdata;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1885 int pageid;
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1886 }
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1887 -(void *)userdata;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1888 -(void)setUserdata:(void *)input;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1889 -(int)pageid;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1890 -(void)setPageid:(int)input;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1891 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1892
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	1893 @implementation DWNotebook
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	1894 -(void *)userdata { return userdata; }
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	1895 -(void)setUserdata:(void *)input { userdata = input; }
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	1896 -(int)pageid { return pageid; }
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	1897 -(void)setPageid:(int)input { pageid = input; }
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	1898 -(void)tabView:(NSTabView )notebook didSelectTabViewItem:(NSTabViewItem )notepage
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	1899 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1900 id object = [notepage view];
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	1901 DWNotebookPage page = (DWNotebookPage )notepage;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	1902
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1903 if([object isMemberOfClass:[DWBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1904 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1905 DWBox *view = object;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1906 Box *box = [view box];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1907 NSSize size = [view frame].size;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1908 _do_resize(box, size.width, size.height);
916 44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	1909 _handle_resize_events(box);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1910 }
1102 cfe7d2b6bc16 Added DW_INT_TO_POINTER/DW_UINT_TO_POINTER/DW_POINTER_TO_INT/DW_POINTER_TO_UINT macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1101 diff changeset	1911 _event_handler(self, DW_INT_TO_POINTER([page pageid]), 15);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	1912 }
1808 f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1913 -(void)keyDown:(NSEvent *)theEvent
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1914 {
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1915 unichar vk = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
1819 d784b85b632e Change incorrect call to DW_MUTEX_LOCK to DW_MUTEX_UNLOCK in dw_mle_get_size() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1809 diff changeset	1916
1809 5efaea897310 Fixed back tab handling for certain controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1808 diff changeset	1917 if(vk == NSTabCharacter \|\| vk == NSBackTabCharacter)
1808 f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1918 [self interpretKeyEvents:[NSArray arrayWithObject:theEvent]];
1809 5efaea897310 Fixed back tab handling for certain controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1808 diff changeset	1919 else if(vk == NSLeftArrowFunctionKey)
1808 f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1920 {
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1921 NSArray *pages = [self tabViewItems];
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1922 DWNotebookPage page = (DWNotebookPage )[self selectedTabViewItem];
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1923 NSUInteger index = [pages indexOfObject:page];
1819 d784b85b632e Change incorrect call to DW_MUTEX_LOCK to DW_MUTEX_UNLOCK in dw_mle_get_size() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1809 diff changeset	1924
1808 f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1925 if(index != NSNotFound)
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1926 {
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1927 if(index > 0)
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1928 [self selectTabViewItem:[pages objectAtIndex:(index-1)]];
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1929 else
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1930 [self selectTabViewItem:[pages objectAtIndex:0]];
1819 d784b85b632e Change incorrect call to DW_MUTEX_LOCK to DW_MUTEX_UNLOCK in dw_mle_get_size() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1809 diff changeset	1931
1808 f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1932 }
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1933 }
1809 5efaea897310 Fixed back tab handling for certain controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1808 diff changeset	1934 else if(vk == NSRightArrowFunctionKey)
1808 f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1935 {
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1936 NSArray *pages = [self tabViewItems];
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1937 DWNotebookPage page = (DWNotebookPage )[self selectedTabViewItem];
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1938 NSUInteger index = [pages indexOfObject:page];
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1939 NSUInteger count = [pages count];
1819 d784b85b632e Change incorrect call to DW_MUTEX_LOCK to DW_MUTEX_UNLOCK in dw_mle_get_size() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1809 diff changeset	1940
1808 f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1941 if(index != NSNotFound)
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1942 {
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1943 if(index + 1 < count)
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1944 [self selectTabViewItem:[pages objectAtIndex:(index+1)]];
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1945 else
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1946 [self selectTabViewItem:[pages objectAtIndex:(count-1)]];
1819 d784b85b632e Change incorrect call to DW_MUTEX_LOCK to DW_MUTEX_UNLOCK in dw_mle_get_size() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1809 diff changeset	1947
1808 f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1948 }
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1949 }
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1950 [super keyDown:theEvent];
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1951 }
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1952 -(void)insertTab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectNextKeyView:self]; }
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1953 -(void)insertBacktab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectPreviousKeyView:self]; }
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	1954 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	1955 @end
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	1956
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1957 @implementation DWNotebookPage
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1958 -(void *)userdata { return userdata; }
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1959 -(void)setUserdata:(void *)input { userdata = input; }
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1960 -(int)pageid { return pageid; }
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1961 -(void)setPageid:(int)input { pageid = input; }
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	1962 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1963 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1964
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1965 /* Subclass for a color chooser type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1966 @interface DWColorChoose : NSColorPanel
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1967 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1968 DWDialog *dialog;
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	1969 NSColor *pickedcolor;
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1970 }
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1971 -(void)changeColor:(id)sender;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1972 -(void)setDialog:(DWDialog *)input;
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	1973 -(DWDialog *)dialog;
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1974 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1975
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1976 @implementation DWColorChoose
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1977 -(void)changeColor:(id)sender
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1978 {
1644 2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	1979 if(!dialog)
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	1980 [self close];
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	1981 else
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1982 pickedcolor = [self color];
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1983 }
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1984 -(BOOL)windowShouldClose:(id)window
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1985 {
1644 2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	1986 if(dialog)
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	1987 {
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1988 DWDialog *d = dialog;
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1989 dialog = nil;
1644 2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	1990 dw_dialog_dismiss(d, pickedcolor);
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	1991 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1992 [self close];
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1993 return NO;
1644 2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	1994 }
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1995 -(void)setDialog:(DWDialog *)input { dialog = input; }
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	1996 -(DWDialog *)dialog { return dialog; }
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1997 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1998
1050 48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	1999 /* Subclass for a font chooser type */
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2000 @interface DWFontChoose : NSFontPanel
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2001 {
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2002 DWDialog *dialog;
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2003 NSFontManager *fontManager;
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2004 }
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2005 -(void)setDialog:(DWDialog *)input;
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2006 -(void)setFontManager:(NSFontManager *)input;
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2007 -(DWDialog *)dialog;
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2008 @end
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2009
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2010 @implementation DWFontChoose
1068 efaa9ceeb253 Removed test for class member for itemdata in dw_tree_item_get_data() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1067 diff changeset	2011 -(BOOL)windowShouldClose:(id)window
efaa9ceeb253 Removed test for class member for itemdata in dw_tree_item_get_data() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1067 diff changeset	2012 {
1050 48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2013 DWDialog *d = dialog; dialog = nil;
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2014 NSFont *pickedfont = [fontManager selectedFont];
1068 efaa9ceeb253 Removed test for class member for itemdata in dw_tree_item_get_data() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1067 diff changeset	2015 dw_dialog_dismiss(d, pickedfont);
efaa9ceeb253 Removed test for class member for itemdata in dw_tree_item_get_data() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1067 diff changeset	2016 [window orderOut:nil];
efaa9ceeb253 Removed test for class member for itemdata in dw_tree_item_get_data() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1067 diff changeset	2017 return NO;
1050 48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2018 }
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2019 -(void)setDialog:(DWDialog *)input { dialog = input; }
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2020 -(void)setFontManager:(NSFontManager *)input { fontManager = input; }
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2021 -(DWDialog *)dialog { return dialog; }
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2022 @end
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2023
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	2024 /* Subclass for a splitbar type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2025 @interface DWSplitBar : NSSplitView
719 d5e49ef8f541 Updated the #if for Snow Leopard/Leopard builds to handle them not being defined properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 718 diff changeset	2026 #ifdef BUILDING_FOR_SNOW_LEOPARD
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2027 <NSSplitViewDelegate>
717 17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	2028 #endif
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2029 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2030 void *userdata;
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	2031 float percent;
1956 2924bc788170 Mac: Added code to avoid unused variable/parameter warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1955 diff changeset	2032 NSInteger Tag;
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	2033 }
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	2034 -(void)splitViewDidResizeSubviews:(NSNotification *)aNotification;
1956 2924bc788170 Mac: Added code to avoid unused variable/parameter warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1955 diff changeset	2035 -(void)setTag:(NSInteger)tag;
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	2036 -(void *)userdata;
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	2037 -(void)setUserdata:(void *)input;
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	2038 -(float)percent;
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	2039 -(void)setPercent:(float)input;
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	2040 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	2041
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	2042 @implementation DWSplitBar
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	2043 -(void)splitViewDidResizeSubviews:(NSNotification *)aNotification
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	2044 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2045 NSArray *views = [self subviews];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2046 id object;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2047
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2048 for(object in views)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2049 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2050 if([object isMemberOfClass:[DWBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2051 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2052 DWBox *view = object;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2053 Box *box = [view box];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2054 NSSize size = [view frame].size;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2055 _do_resize(box, size.width, size.height);
916 44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	2056 _handle_resize_events(box);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2057 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2058 }
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	2059 }
1957 c15af2f757e2 Mac: Initial code to support Dark Mode on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1956 diff changeset	2060 -(void)setTag:(NSInteger)tag { Tag = tag; }
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	2061 -(void *)userdata { return userdata; }
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	2062 -(void)setUserdata:(void *)input { userdata = input; }
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	2063 -(float)percent { return percent; }
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	2064 -(void)setPercent:(float)input { percent = input; }
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	2065 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	2066 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	2067
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2068 /* Subclass for a slider type */
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2069 @interface DWSlider : NSSlider
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2070 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2071 void *userdata;
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2072 }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2073 -(void *)userdata;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2074 -(void)setUserdata:(void *)input;
704 336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	2075 -(void)sliderChanged:(id)sender;
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2076 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2077
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2078 @implementation DWSlider
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2079 -(void *)userdata { return userdata; }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2080 -(void)setUserdata:(void *)input { userdata = input; }
705 7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	2081 -(void)sliderChanged:(id)sender { _event_handler(self, (void *)[self integerValue], 14); }
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	2082 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2083 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2084
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2085 /* Subclass for a slider type */
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2086 @interface DWScrollbar : NSScroller
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2087 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2088 void *userdata;
933 b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	2089 double range;
b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	2090 double visible;
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	2091 int vertical;
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2092 }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2093 -(void *)userdata;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2094 -(void)setUserdata:(void *)input;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2095 -(float)range;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2096 -(float)visible;
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	2097 -(int)vertical;
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	2098 -(void)setVertical:(int)value;
933 b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	2099 -(void)setRange:(double)input1 andVisible:(double)input2;
705 7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	2100 -(void)scrollerChanged:(id)sender;
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2101 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2102
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2103 @implementation DWScrollbar
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2104 -(void *)userdata { return userdata; }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2105 -(void)setUserdata:(void *)input { userdata = input; }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2106 -(float)range { return range; }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2107 -(float)visible { return visible; }
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	2108 -(int)vertical { return vertical; }
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	2109 -(void)setVertical:(int)value { vertical = value; }
933 b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	2110 -(void)setRange:(double)input1 andVisible:(double)input2 { range = input1; visible = input2; }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2111 -(void)scrollerChanged:(id)sender
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2112 {
933 b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	2113 double max = (range - visible);
923 0ac67b62b594 Fix int to double conversion issues causing scrollbar issues on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 922 diff changeset	2114 double result = ([self doubleValue] * max);
0ac67b62b594 Fix int to double conversion issues causing scrollbar issues on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 922 diff changeset	2115 double newpos = result;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	2116
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2117 switch ([sender hitPart])
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2118 {
1944 d37f30a7c233 Mac: In an earlier commit I moved code regarding NSScroller arrow positions into YOSEMITE #ifdef due to the arrows not being available since 10.7. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1943 diff changeset	2119 #ifndef BUILDING_FOR_YOSEMITE
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2120 case NSScrollerDecrementLine:
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2121 if(newpos > 0)
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2122 {
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2123 newpos--;
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2124 }
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2125 break;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2126
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2127 case NSScrollerIncrementLine:
712 01107d8e033e Fixed the scrollbar maximum range to be correct. Also added some MLE code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 711 diff changeset	2128 if(newpos < max)
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2129 {
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2130 newpos++;
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2131 }
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2132 break;
1944 d37f30a7c233 Mac: In an earlier commit I moved code regarding NSScroller arrow positions into YOSEMITE #ifdef due to the arrows not being available since 10.7. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1943 diff changeset	2133 #endif
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2134 case NSScrollerDecrementPage:
933 b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	2135 newpos -= visible;
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2136 if(newpos < 0)
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2137 {
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2138 newpos = 0;
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2139 }
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2140 break;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2141
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2142 case NSScrollerIncrementPage:
933 b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	2143 newpos += visible;
712 01107d8e033e Fixed the scrollbar maximum range to be correct. Also added some MLE code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 711 diff changeset	2144 if(newpos > max)
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2145 {
712 01107d8e033e Fixed the scrollbar maximum range to be correct. Also added some MLE code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 711 diff changeset	2146 newpos = max;
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2147 }
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2148 break;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2149
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2150 default:
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	2151 ; /* do nothing */
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2152 }
933 b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	2153 int newposi = (int)newpos;
b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	2154 newpos = (newpos - (double)newposi) > 0.5 ? (double)(newposi + 1) : (double)newposi;
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2155 if(newpos != result)
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2156 {
923 0ac67b62b594 Fix int to double conversion issues causing scrollbar issues on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 922 diff changeset	2157 [self setDoubleValue:(newpos/max)];
0ac67b62b594 Fix int to double conversion issues causing scrollbar issues on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 922 diff changeset	2158 }
1102 cfe7d2b6bc16 Added DW_INT_TO_POINTER/DW_UINT_TO_POINTER/DW_POINTER_TO_INT/DW_POINTER_TO_UINT macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1101 diff changeset	2159 _event_handler(self, DW_INT_TO_POINTER((int)newpos), 14);
707 86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2160 }
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	2161 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2162 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2163
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2164 /* Subclass for a MLE type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2165 @interface DWMLE : NSTextView
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2166 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2167 void *userdata;
1543 b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	2168 id scrollview;
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2169 }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2170 -(void *)userdata;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2171 -(void)setUserdata:(void *)input;
1543 b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	2172 -(id)scrollview;
b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	2173 -(void)setScrollview:(id)input;
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2174 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2175
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2176 @implementation DWMLE
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2177 -(void *)userdata { return userdata; }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2178 -(void)setUserdata:(void *)input { userdata = input; }
1543 b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	2179 -(id)scrollview { return scrollview; }
b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	2180 -(void)setScrollview:(id)input { scrollview = input; }
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	2181 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2182 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2183
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2184 /* Subclass NSTextFieldCell for displaying image and text */
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2185 @interface DWImageAndTextCell : NSTextFieldCell
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2186 {
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2187 @private
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2188 NSImage *image;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2189 }
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2190 -(void)setImage:(NSImage *)anImage;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2191 -(NSImage *)image;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2192 -(void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2193 -(NSSize)cellSize;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2194 @end
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2195
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2196 @implementation DWImageAndTextCell
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2197 -(void)dealloc
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2198 {
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2199 [image release];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2200 image = nil;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2201 [super dealloc];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2202 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2203 -copyWithZone:(NSZone *)zone
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2204 {
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2205 DWImageAndTextCell cell = (DWImageAndTextCell )[super copyWithZone:zone];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2206 cell->image = [image retain];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2207 return cell;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2208 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2209 -(void)setImage:(NSImage *)anImage
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2210 {
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2211 if(anImage != image)
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2212 {
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2213 [image release];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2214 image = [anImage retain];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2215 }
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2216 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2217 -(NSImage *)image
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2218 {
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2219 return [[image retain] autorelease];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2220 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2221 -(NSRect)imageFrameForCellFrame:(NSRect)cellFrame
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2222 {
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2223 if(image != nil)
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2224 {
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2225 NSRect imageFrame;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2226 imageFrame.size = [image size];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2227 imageFrame.origin = cellFrame.origin;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2228 imageFrame.origin.x += 3;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2229 imageFrame.origin.y += ceil((cellFrame.size.height - imageFrame.size.height) / 2);
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2230 return imageFrame;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2231 }
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2232 else
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2233 return NSZeroRect;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2234 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2235 -(void)editWithFrame:(NSRect)aRect inView:(NSView )controlView editor:(NSText )textObj delegate:(id)anObject event:(NSEvent *)theEvent
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2236 {
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2237 NSRect textFrame, imageFrame;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2238 NSDivideRect (aRect, &imageFrame, &textFrame, 3 + [image size].width, NSMinXEdge);
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2239 [super editWithFrame: textFrame inView: controlView editor:textObj delegate:anObject event: theEvent];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2240 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2241 -(void)selectWithFrame:(NSRect)aRect inView:(NSView )controlView editor:(NSText )textObj delegate:(id)anObject start:(NSInteger)selStart length:(NSInteger)selLength
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2242 {
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2243 NSRect textFrame, imageFrame;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2244 NSDivideRect (aRect, &imageFrame, &textFrame, 3 + [image size].width, NSMinXEdge);
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2245 [super selectWithFrame: textFrame inView: controlView editor:textObj delegate:anObject start:selStart length:selLength];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2246 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2247 -(void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2248 {
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2249 if(image != nil)
1210 5a016a5a7412 Slight change in design behavior for dw_container_set_row_bg()... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1206 diff changeset	2250 {
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2251 NSSize imageSize;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2252 NSRect imageFrame;
1779 f77b76c86d19 Readd support for 10.5... the drawInRect method I was using only supports 10.6 and higher... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1778 diff changeset	2253 SEL sdir = NSSelectorFromString(@"drawInRect:fromRect:operation:fraction:respectFlipped:hints:");
1940 38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	2254 NSCompositingOperation op = DWCompositingOperationSourceOver;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2255
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2256 imageSize = [image size];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2257 NSDivideRect(cellFrame, &imageFrame, &cellFrame, 3 + imageSize.width, NSMinXEdge);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2258 if ([self drawsBackground])
1210 5a016a5a7412 Slight change in design behavior for dw_container_set_row_bg()... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1206 diff changeset	2259 {
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2260 [[self backgroundColor] set];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2261 NSRectFill(imageFrame);
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2262 }
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2263 imageFrame.origin.x += 3;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2264 imageFrame.size = imageSize;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2265
1779 f77b76c86d19 Readd support for 10.5... the drawInRect method I was using only supports 10.6 and higher... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1778 diff changeset	2266 /* New method for 10.6 and later */
f77b76c86d19 Readd support for 10.5... the drawInRect method I was using only supports 10.6 and higher... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1778 diff changeset	2267 if([image respondsToSelector:sdir])
f77b76c86d19 Readd support for 10.5... the drawInRect method I was using only supports 10.6 and higher... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1778 diff changeset	2268 {
1993 e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	2269 DWIMP idir = (DWIMP)[image methodForSelector:sdir];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2270
1779 f77b76c86d19 Readd support for 10.5... the drawInRect method I was using only supports 10.6 and higher... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1778 diff changeset	2271 imageFrame.origin.y += ceil((cellFrame.size.height - imageFrame.size.height) / 2);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2272
1914 3872ab37297b Fix numerous deprecation warnings building with SDK 10.12 Sierra. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1908 diff changeset	2273 idir(image, sdir, imageFrame, NSZeroRect, op, 1.0, YES, nil);
1779 f77b76c86d19 Readd support for 10.5... the drawInRect method I was using only supports 10.6 and higher... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1778 diff changeset	2274 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2275 else
1779 f77b76c86d19 Readd support for 10.5... the drawInRect method I was using only supports 10.6 and higher... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1778 diff changeset	2276 {
f77b76c86d19 Readd support for 10.5... the drawInRect method I was using only supports 10.6 and higher... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1778 diff changeset	2277 /* Old method for 10.5 */
f77b76c86d19 Readd support for 10.5... the drawInRect method I was using only supports 10.6 and higher... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1778 diff changeset	2278 SEL sctp = NSSelectorFromString(@"compositeToPoint:operation:");
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2279
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2280 if ([controlView isFlipped])
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2281 imageFrame.origin.y += ceil((cellFrame.size.height + imageFrame.size.height) / 2);
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2282 else
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2283 imageFrame.origin.y += ceil((cellFrame.size.height - imageFrame.size.height) / 2);
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2284
1779 f77b76c86d19 Readd support for 10.5... the drawInRect method I was using only supports 10.6 and higher... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1778 diff changeset	2285 if([image respondsToSelector:sctp])
f77b76c86d19 Readd support for 10.5... the drawInRect method I was using only supports 10.6 and higher... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1778 diff changeset	2286 {
1993 e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	2287 DWIMP ictp = (DWIMP)[image methodForSelector:sctp];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2288
1914 3872ab37297b Fix numerous deprecation warnings building with SDK 10.12 Sierra. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1908 diff changeset	2289 ictp(image, sctp, imageFrame.origin, op);
1779 f77b76c86d19 Readd support for 10.5... the drawInRect method I was using only supports 10.6 and higher... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1778 diff changeset	2290 }
f77b76c86d19 Readd support for 10.5... the drawInRect method I was using only supports 10.6 and higher... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1778 diff changeset	2291 }
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2292 }
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2293 [super drawWithFrame:cellFrame inView:controlView];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2294 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2295 -(NSSize)cellSize
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2296 {
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2297 NSSize cellSize = [super cellSize];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2298 cellSize.width += (image ? [image size].width : 0) + 3;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2299 return cellSize;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2300 }
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2301 @end
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2302
655 27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	2303 /* Subclass for a Container/List type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2304 @interface DWContainer : NSTableView
719 d5e49ef8f541 Updated the #if for Snow Leopard/Leopard builds to handle them not being defined properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 718 diff changeset	2305 #ifdef BUILDING_FOR_SNOW_LEOPARD
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	2306 <NSTableViewDataSource,NSTableViewDelegate>
717 17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	2307 #endif
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	2308 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2309 void *userdata;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2310 NSMutableArray *tvcols;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2311 NSMutableArray *data;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2312 NSMutableArray *types;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2313 NSPointerArray *titles;
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	2314 NSPointerArray *rowdatas;
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2315 NSColor fgcolor, oddcolor, *evencolor;
1958 45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2316 unsigned long dw_oddcolor, dw_evencolor;
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2317 unsigned long _DW_COLOR_ROW_ODD, _DW_COLOR_ROW_EVEN;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2318 int lastAddPoint, lastQueryPoint;
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	2319 id scrollview;
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	2320 int filesystem;
658 0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	2321 }
0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	2322 -(NSInteger)numberOfRowsInTableView:(NSTableView *)aTable;
0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	2323 -(id)tableView:(NSTableView )aTable objectValueForTableColumn:(NSTableColumn )aCol row:(NSInteger)aRow;
708 5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	2324 -(BOOL)tableView:(NSTableView )aTableView shouldEditTableColumn:(NSTableColumn )aTableColumn row:(int)rowIndex;
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	2325 -(void *)userdata;
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	2326 -(void)setUserdata:(void *)input;
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	2327 -(void)setFilesystem:(int)input;
831 168b9db65825 Minor fix for dw_container_column_set_width() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 829 diff changeset	2328 -(int)filesystem;
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	2329 -(id)scrollview;
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	2330 -(void)setScrollview:(id)input;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	2331 -(void)addColumn:(NSTableColumn *)input andType:(int)type;
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	2332 -(NSTableColumn *)getColumn:(int)col;
658 0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	2333 -(int)addRow:(NSArray *)input;
0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	2334 -(int)addRows:(int)number;
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	2335 -(void)tableView:(NSTableView )tableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn )tableColumn row:(NSInteger)row;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	2336 -(void)editCell:(id)input at:(int)row and:(int)col;
662 d7badd5606ca Removed the Carbon source file, and changes to configure to build the Cocoa version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 661 diff changeset	2337 -(void)removeRow:(int)row;
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	2338 -(void)setRow:(int)row title:(const char *)input;
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	2339 -(void *)getRowTitle:(int)row;
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	2340 -(id)getRow:(int)row and:(int)col;
662 d7badd5606ca Removed the Carbon source file, and changes to configure to build the Cocoa version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 661 diff changeset	2341 -(int)cellType:(int)col;
658 0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	2342 -(int)lastAddPoint;
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	2343 -(int)lastQueryPoint;
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	2344 -(void)setLastQueryPoint:(int)input;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	2345 -(void)clear;
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	2346 -(void)setup;
856 9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2347 -(void)optimize;
1573 d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2348 -(NSSize)getsize;
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	2349 -(void)setForegroundColor:(NSColor *)input;
708 5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	2350 -(void)doubleClicked:(id)sender;
829 f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	2351 -(void)keyUp:(NSEvent *)theEvent;
867 139acecd6ca0 Guess I wanted to trap didClickTableColumn instead of mouseDownInHeaderOfTableColumn to avoid spurious events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 866 diff changeset	2352 -(void)tableView:(NSTableView )tableView didClickTableColumn:(NSTableColumn )tableColumn;
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	2353 -(void)selectionChanged:(id)sender;
756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	2354 -(NSMenu )menuForEvent:(NSEvent )event;
1924 c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	2355 #ifdef BUILDING_FOR_LION1
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	2356 -(NSView )tableView:(NSTableView )tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row;
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	2357 #endif
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	2358 @end
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	2359
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	2360 @implementation DWContainer
658 0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	2361 -(NSInteger)numberOfRowsInTableView:(NSTableView *)aTable
0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	2362 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2363 if(tvcols && data)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2364 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2365 int cols = (int)[tvcols count];
1134 41a93f9896e3 Avoid an array out of bounds after container clear on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1133 diff changeset	2366 int total = (int)[data count];
41a93f9896e3 Avoid an array out of bounds after container clear on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1133 diff changeset	2367 if(cols && total)
41a93f9896e3 Avoid an array out of bounds after container clear on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1133 diff changeset	2368 {
41a93f9896e3 Avoid an array out of bounds after container clear on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1133 diff changeset	2369 return total / cols;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2370 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2371 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2372 return 0;
658 0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	2373 }
0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	2374 -(id)tableView:(NSTableView )aTable objectValueForTableColumn:(NSTableColumn )aCol row:(NSInteger)aRow
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	2375 {
1134 41a93f9896e3 Avoid an array out of bounds after container clear on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1133 diff changeset	2376 if(tvcols && data)
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2377 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2378 int z, col = -1;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2379 int count = (int)[tvcols count];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2380
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2381 for(z=0;z<count;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2382 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2383 if([tvcols objectAtIndex:z] == aCol)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2384 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2385 col = z;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2386 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2387 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2388 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2389 if(col != -1)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2390 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2391 int index = (int)(aRow * count) + col;
1134 41a93f9896e3 Avoid an array out of bounds after container clear on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1133 diff changeset	2392 if(index < [data count])
41a93f9896e3 Avoid an array out of bounds after container clear on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1133 diff changeset	2393 {
41a93f9896e3 Avoid an array out of bounds after container clear on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1133 diff changeset	2394 id this = [data objectAtIndex:index];
41a93f9896e3 Avoid an array out of bounds after container clear on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1133 diff changeset	2395 return ([this isKindOfClass:[NSNull class]]) ? nil : this;
41a93f9896e3 Avoid an array out of bounds after container clear on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1133 diff changeset	2396 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2397 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2398 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2399 return nil;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	2400 }
1924 c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	2401 #ifdef BUILDING_FOR_LION1
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	2402 -(NSView )tableView:(NSTableView )tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	2403 {
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	2404 ItemCellView *result = [tableView makeViewWithIdentifier:tableColumn.identifier owner:self];
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	2405 Item *item = [self.items objectAtIndex:row];
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	2406 result.imageView.image = item.itemIcon;
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	2407 result.textField.stringValue = item.itemDisplayName;
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	2408 result.detailTextField.stringValue = item.itemKind;
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	2409 return result;
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	2410 }
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	2411 #endif
708 5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	2412 -(BOOL)tableView:(NSTableView )aTableView shouldEditTableColumn:(NSTableColumn )aTableColumn row:(int)rowIndex { return NO; }
658 0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	2413 -(void *)userdata { return userdata; }
0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	2414 -(void)setUserdata:(void *)input { userdata = input; }
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	2415 -(void)setFilesystem:(int)input { filesystem = input; }
831 168b9db65825 Minor fix for dw_container_column_set_width() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 829 diff changeset	2416 -(int)filesystem { return filesystem; }
717 17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	2417 -(id)scrollview { return scrollview; }
17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	2418 -(void)setScrollview:(id)input { scrollview = input; }
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	2419 -(void)addColumn:(NSTableColumn *)input andType:(int)type { if(tvcols) { [tvcols addObject:input]; [types addObject:[NSNumber numberWithInt:type]]; } }
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	2420 -(NSTableColumn *)getColumn:(int)col { if(tvcols) { return [tvcols objectAtIndex:col]; } return nil; }
1958 45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2421 -(void)refreshColors
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2422 {
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2423 NSColor *oldodd = oddcolor;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2424 NSColor *oldeven = evencolor;
1958 45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2425 unsigned long thisodd = dw_oddcolor == DW_CLR_DEFAULT ? _DW_COLOR_ROW_ODD : dw_oddcolor;
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2426 unsigned long _odd = _get_color(thisodd);
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2427 unsigned long thiseven = dw_evencolor == DW_CLR_DEFAULT ? _DW_COLOR_ROW_EVEN : dw_evencolor;
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2428 unsigned long _even = _get_color(thiseven);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2429
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2430 /* Get the NSColor for non-default colors */
1958 45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2431 if(thisodd != DW_RGB_TRANSPARENT)
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2432 oddcolor = [[NSColor colorWithDeviceRed: DW_RED_VALUE(_odd)/255.0 green: DW_GREEN_VALUE(_odd)/255.0 blue: DW_BLUE_VALUE(_odd)/255.0 alpha: 1] retain];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2433 else
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2434 oddcolor = NULL;
1958 45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2435 if(thiseven != DW_RGB_TRANSPARENT)
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2436 evencolor = [[NSColor colorWithDeviceRed: DW_RED_VALUE(_even)/255.0 green: DW_GREEN_VALUE(_even)/255.0 blue: DW_BLUE_VALUE(_even)/255.0 alpha: 1] retain];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2437 else
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2438 evencolor = NULL;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2439 [oldodd release];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2440 [oldeven release];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2441 }
1958 45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2442 -(void)setRowBgOdd:(unsigned long)oddcol andEven:(unsigned long)evencol
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2443 {
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2444 /* Save the set colors in case we get a theme change */
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2445 dw_oddcolor = oddcol;
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2446 dw_evencolor = evencol;
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2447 [self refreshColors];
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2448 }
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2449 -(void)checkDark
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2450 {
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2451 /* Update any system colors based on the Dark Mode */
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2452 _DW_COLOR_ROW_EVEN = DW_RGB_TRANSPARENT;
1984 09a102c92788 Mac: Fix building on MacOS 10.7 Lion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1983 diff changeset	2453 if(_is_dark(self))
1958 45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2454 _DW_COLOR_ROW_ODD = DW_RGB(100, 100, 100);
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2455 else
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2456 _DW_COLOR_ROW_ODD = DW_RGB(230, 230, 230);
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2457 /* Only refresh if we've been setup already */
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2458 if(titles)
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2459 [self refreshColors];
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2460 }
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2461 -(void)viewDidChangeEffectiveAppearance { [self checkDark]; }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2462 -(int)insertRow:(NSArray *)input at:(int)index
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2463 {
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2464 if(data)
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2465 {
687 5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	2466 unsigned long start = [tvcols count] * index;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2467 NSIndexSet *set = [[NSIndexSet alloc] initWithIndexesInRange:NSMakeRange(start, start + [tvcols count])];
687 5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	2468 if(index < lastAddPoint)
5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	2469 {
5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	2470 lastAddPoint++;
5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	2471 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2472 [data insertObjects:input atIndexes:set];
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2473 [titles insertPointer:NULL atIndex:index];
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	2474 [rowdatas insertPointer:NULL atIndex:index];
687 5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	2475 [set release];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2476 return (int)[titles count];
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2477 }
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2478 return 0;
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2479 }
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2480 -(int)addRow:(NSArray *)input
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2481 {
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2482 if(data)
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2483 {
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2484 lastAddPoint = (int)[titles count];
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2485 [data addObjectsFromArray:input];
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2486 [titles addPointer:NULL];
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	2487 [rowdatas addPointer:NULL];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2488 return (int)[titles count];
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2489 }
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2490 return 0;
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	2491 }
658 0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	2492 -(int)addRows:(int)number
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	2493 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2494 if(tvcols)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2495 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2496 int count = (int)(number * [tvcols count]);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2497 int z;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2498
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2499 lastAddPoint = (int)[titles count];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2500
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2501 for(z=0;z<count;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2502 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2503 [data addObject:[NSNull null]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2504 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2505 for(z=0;z<number;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2506 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2507 [titles addPointer:NULL];
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	2508 [rowdatas addPointer:NULL];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2509 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2510 return (int)[titles count];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2511 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2512 return 0;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2513 }
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	2514 -(void)tableView:(NSTableView )tableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn )tableColumn row:(NSInteger)row
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	2515 {
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2516 DWImageAndTextCell *bcell = cell;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2517
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2518 /* Handle drawing image and text if necessary */
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2519 if([cell isMemberOfClass:[DWImageAndTextCell class]])
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	2520 {
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	2521 int index = (int)(row * [tvcols count]);
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2522 DWImageAndTextCell *browsercell = [data objectAtIndex:index];
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	2523 NSImage *img = [browsercell image];
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2524 [bcell setImage:img];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2525 }
1215 dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2526 if([cell isKindOfClass:[NSTextFieldCell class]])
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2527 {
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2528 /* Handle drawing alternating row colors if enabled */
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2529 if ((row % 2) == 0)
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2530 {
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2531 if(evencolor)
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2532 {
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2533 [bcell setDrawsBackground:YES];
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2534 [bcell setBackgroundColor:evencolor];
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2535 }
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2536 else
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2537 [bcell setDrawsBackground:NO];
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2538 }
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2539 else
1215 dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2540 {
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2541 if(oddcolor)
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2542 {
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2543 [bcell setDrawsBackground:YES];
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2544 [bcell setBackgroundColor:oddcolor];
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2545 }
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2546 else
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2547 [bcell setDrawsBackground:NO];
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2548 }
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	2549 }
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	2550 }
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	2551 -(void)editCell:(id)input at:(int)row and:(int)col
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	2552 {
1288 d10969835d2d Changes to allow removing icon on BITMAPORICON container columns on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1279 diff changeset	2553 if(tvcols)
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2554 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2555 int index = (int)(row * [tvcols count]) + col;
934 13384e89964c Put in a bounds check just on a hunch when editing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 933 diff changeset	2556 if(index < [data count])
13384e89964c Put in a bounds check just on a hunch when editing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 933 diff changeset	2557 {
1288 d10969835d2d Changes to allow removing icon on BITMAPORICON container columns on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1279 diff changeset	2558 if(!input)
d10969835d2d Changes to allow removing icon on BITMAPORICON container columns on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1279 diff changeset	2559 input = [NSNull null];
934 13384e89964c Put in a bounds check just on a hunch when editing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 933 diff changeset	2560 [data replaceObjectAtIndex:index withObject:input];
13384e89964c Put in a bounds check just on a hunch when editing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 933 diff changeset	2561 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2562 }
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	2563 }
662 d7badd5606ca Removed the Carbon source file, and changes to configure to build the Cocoa version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 661 diff changeset	2564 -(void)removeRow:(int)row
d7badd5606ca Removed the Carbon source file, and changes to configure to build the Cocoa version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 661 diff changeset	2565 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2566 if(tvcols)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2567 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2568 int z, start, end;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2569 int count = (int)[tvcols count];
1874 71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2570 void *oldtitle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2571
1705 3fa0448d3a7e Fixed a bug in dw_container_delete_row() on Mac and potentially a similar bug in dw_container_delete(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1704 diff changeset	2572 start = (count * row);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2573 end = start + count;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2574
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2575 for(z=start;z<end;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2576 {
1705 3fa0448d3a7e Fixed a bug in dw_container_delete_row() on Mac and potentially a similar bug in dw_container_delete(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1704 diff changeset	2577 [data removeObjectAtIndex:start];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2578 }
1874 71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2579 oldtitle = [titles pointerAtIndex:row];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2580 [titles removePointerAtIndex:row];
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	2581 [rowdatas removePointerAtIndex:row];
1705 3fa0448d3a7e Fixed a bug in dw_container_delete_row() on Mac and potentially a similar bug in dw_container_delete(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1704 diff changeset	2582 if(lastAddPoint > 0 && lastAddPoint > row)
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2583 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2584 lastAddPoint--;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2585 }
1874 71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2586 if(oldtitle)
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2587 free(oldtitle);
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2588 }
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2589 }
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	2590 -(void)setRow:(int)row title:(const char *)input
1874 71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2591 {
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2592 if(titles && input)
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2593 {
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2594 void *oldtitle = [titles pointerAtIndex:row];
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	2595 void newtitle = input ? (void )strdup(input) : NULL;
1874 71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2596 [titles replacePointerAtIndex:row withPointer:newtitle];
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2597 if(oldtitle)
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2598 free(oldtitle);
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2599 }
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2600 }
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	2601 -(void)setRowData:(int)row title:(void *)input { if(rowdatas && input) { [rowdatas replacePointerAtIndex:row withPointer:input]; } }
683 7385011c3327 Fixed a minor issue causing crashes when right clicking on an empty container. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 682 diff changeset	2602 -(void *)getRowTitle:(int)row { if(titles && row > -1) { return [titles pointerAtIndex:row]; } return NULL; }
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	2603 -(void *)getRowData:(int)row { if(rowdatas && row > -1) { return [rowdatas pointerAtIndex:row]; } return NULL; }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	2604 -(id)getRow:(int)row and:(int)col { if(data) { int index = (int)(row * [tvcols count]) + col; return [data objectAtIndex:index]; } return nil; }
662 d7badd5606ca Removed the Carbon source file, and changes to configure to build the Cocoa version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 661 diff changeset	2605 -(int)cellType:(int)col { return [[types objectAtIndex:col] intValue]; }
658 0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	2606 -(int)lastAddPoint { return lastAddPoint; }
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	2607 -(int)lastQueryPoint { return lastQueryPoint; }
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	2608 -(void)setLastQueryPoint:(int)input { lastQueryPoint = input; }
1874 71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2609 -(void)clear
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2610 {
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2611 if(data)
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2612 {
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2613 [data removeAllObjects];
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2614 while([titles count])
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2615 {
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2616 void *oldtitle = [titles pointerAtIndex:0];
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2617 [titles removePointerAtIndex:0];
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2618 [rowdatas removePointerAtIndex:0];
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2619 if(oldtitle)
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2620 free(oldtitle);
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2621 }
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2622 }
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2623 lastAddPoint = 0;
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2624 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2625 -(void)setup
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2626 {
1774 4cc999e757a3 Check for pointerArrayWithWeakObjects before weakObjectsPointerArray on Mac bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1773 diff changeset	2627 SEL swopa = NSSelectorFromString(@"pointerArrayWithWeakObjects");
1773 da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	2628
da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	2629 if(![[NSPointerArray class] respondsToSelector:swopa])
1774 4cc999e757a3 Check for pointerArrayWithWeakObjects before weakObjectsPointerArray on Mac bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1773 diff changeset	2630 swopa = NSSelectorFromString(@"weakObjectsPointerArray");
1773 da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	2631 if(![[NSPointerArray class] respondsToSelector:swopa])
da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	2632 return;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2633
1993 e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	2634 DWIMP iwopa = (DWIMP)[[NSPointerArray class] methodForSelector:swopa];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2635
1773 da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	2636 titles = iwopa([NSPointerArray class], swopa);
da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	2637 [titles retain];
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	2638 rowdatas = iwopa([NSPointerArray class], swopa);
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	2639 [rowdatas retain];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2640 tvcols = [[[NSMutableArray alloc] init] retain];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2641 data = [[[NSMutableArray alloc] init] retain];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2642 types = [[[NSMutableArray alloc] init] retain];
1958 45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2643 if(!dw_oddcolor && !dw_evencolor)
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2644 dw_oddcolor = dw_evencolor = DW_CLR_DEFAULT;
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2645 [self checkDark];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2646 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(selectionChanged:) name:NSTableViewSelectionDidChangeNotification object:self];
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	2647 }
1573 d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2648 -(NSSize)getsize
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2649 {
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2650 int cwidth = 0, cheight = 0;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2651
1573 d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2652 if(tvcols)
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2653 {
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2654 int z;
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2655 int colcount = (int)[tvcols count];
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2656 int rowcount = (int)[self numberOfRowsInTableView:self];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2657
1573 d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2658 for(z=0;z<colcount;z++)
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2659 {
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2660 NSTableColumn *column = [tvcols objectAtIndex:z];
1574 ae5e322584cd Use [NSTableColumn width] method to get header width on Mac instead of frame size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1573 diff changeset	2661 int width = [column width];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2662
1573 d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2663 if(rowcount > 0)
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2664 {
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2665 int x;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2666
1573 d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2667 for(x=0;x<rowcount;x++)
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2668 {
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2669 NSCell *cell = [self preparedCellAtColumn:z row:x];
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2670 int thiswidth = [cell cellSize].width;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2671
1573 d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2672 /* If on the first column... add up the heights */
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2673 if(z == 0)
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2674 cheight += [cell cellSize].height;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2675
1573 d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2676 /* Check the image inside the cell to get its width */
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2677 if([cell isMemberOfClass:[NSImageCell class]])
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2678 {
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2679 int index = (int)(x * [tvcols count]) + z;
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2680 NSImage *image = [data objectAtIndex:index];
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2681 if([image isMemberOfClass:[NSImage class]])
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2682 {
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2683 thiswidth = [image size].width;
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2684 }
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2685 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2686
1573 d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2687 if(thiswidth > width)
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2688 {
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2689 width = thiswidth;
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2690 }
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2691 }
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2692 /* If the image is missing default the optimized width to 16. */
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2693 if(!width && [[types objectAtIndex:z] intValue] & DW_CFA_BITMAPORICON)
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2694 {
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2695 width = 16;
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2696 }
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2697 }
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2698 if(width)
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2699 cwidth += width;
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2700 }
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2701 }
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2702 cwidth += 16;
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2703 cheight += 16;
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2704 return NSMakeSize(cwidth, cheight);
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2705 }
856 9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2706 -(void)optimize
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2707 {
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2708 if(tvcols)
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2709 {
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2710 int z;
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2711 int colcount = (int)[tvcols count];
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2712 int rowcount = (int)[self numberOfRowsInTableView:self];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	2713
856 9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2714 for(z=0;z<colcount;z++)
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2715 {
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2716 NSTableColumn *column = [tvcols objectAtIndex:z];
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2717 if([column resizingMask] != NSTableColumnNoResizing)
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2718 {
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2719 if(rowcount > 0)
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2720 {
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2721 int x;
1135 6828a01ecf3c Include the header column text width during container optimize on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1134 diff changeset	2722 NSCell *colcell = [column headerCell];
6828a01ecf3c Include the header column text width during container optimize on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1134 diff changeset	2723 int width = [colcell cellSize].width;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	2724
856 9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2725 for(x=0;x<rowcount;x++)
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2726 {
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2727 NSCell *cell = [self preparedCellAtColumn:z row:x];
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2728 int thiswidth = [cell cellSize].width;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	2729
866 ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	2730 /* Check the image inside the cell to get its width */
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	2731 if([cell isMemberOfClass:[NSImageCell class]])
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	2732 {
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	2733 int index = (int)(x * [tvcols count]) + z;
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	2734 NSImage *image = [data objectAtIndex:index];
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	2735 if([image isMemberOfClass:[NSImage class]])
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	2736 {
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	2737 thiswidth = [image size].width;
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	2738 }
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	2739 }
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	2740
856 9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2741 if(thiswidth > width)
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2742 {
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2743 width = thiswidth;
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2744 }
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2745 }
866 ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	2746 /* If the image is missing default the optimized width to 16. */
864 ca01c7d95b80 Added some sanity checks for a couple of problem functions and default optimized container column width to 16 for image columns. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 860 diff changeset	2747 if(!width && [[types objectAtIndex:z] intValue] & DW_CFA_BITMAPORICON)
ca01c7d95b80 Added some sanity checks for a couple of problem functions and default optimized container column width to 16 for image columns. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 860 diff changeset	2748 {
ca01c7d95b80 Added some sanity checks for a couple of problem functions and default optimized container column width to 16 for image columns. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 860 diff changeset	2749 width = 16;
ca01c7d95b80 Added some sanity checks for a couple of problem functions and default optimized container column width to 16 for image columns. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 860 diff changeset	2750 }
ca01c7d95b80 Added some sanity checks for a couple of problem functions and default optimized container column width to 16 for image columns. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 860 diff changeset	2751 /* Sanity check... don't set the width to 0 */
ca01c7d95b80 Added some sanity checks for a couple of problem functions and default optimized container column width to 16 for image columns. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 860 diff changeset	2752 if(width)
ca01c7d95b80 Added some sanity checks for a couple of problem functions and default optimized container column width to 16 for image columns. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 860 diff changeset	2753 {
1963 80f6be39b7fe Mac: Miscellaneous container/listox fixes. Add a single pixel to the column bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1959 diff changeset	2754 [column setWidth:width+1];
864 ca01c7d95b80 Added some sanity checks for a couple of problem functions and default optimized container column width to 16 for image columns. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 860 diff changeset	2755 }
856 9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2756 }
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2757 else
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2758 {
1963 80f6be39b7fe Mac: Miscellaneous container/listox fixes. Add a single pixel to the column bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1959 diff changeset	2759 if(self.headerView)
80f6be39b7fe Mac: Miscellaneous container/listox fixes. Add a single pixel to the column bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1959 diff changeset	2760 [column sizeToFit];
856 9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2761 }
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2762 }
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2763 }
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2764 }
9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	2765 }
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	2766 -(void)setForegroundColor:(NSColor *)input
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	2767 {
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	2768 int z, count = (int)[tvcols count];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	2769
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	2770 fgcolor = input;
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	2771 [fgcolor retain];
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	2772
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	2773 for(z=0;z<count;z++)
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	2774 {
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	2775 NSTableColumn *tableColumn = [tvcols objectAtIndex:z];
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	2776 NSTextFieldCell *cell = [tableColumn dataCell];
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	2777 [cell setTextColor:fgcolor];
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	2778 }
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	2779 }
708 5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	2780 -(void)doubleClicked:(id)sender
5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	2781 {
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	2782 void *params[2];
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	2783
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	2784 params[0] = (void *)[self getRowTitle:(int)[self selectedRow]];
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	2785 params[1] = (void *)[self getRowData:(int)[self selectedRow]];
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	2786
708 5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	2787 /* Handler for container class */
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	2788 _event_handler(self, (NSEvent *)params, 9);
708 5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	2789 }
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	2790 -(void)keyUp:(NSEvent *)theEvent
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	2791 {
829 f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	2792 if([[theEvent charactersIgnoringModifiers] characterAtIndex:0] == VK_RETURN)
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	2793 {
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	2794 void *params[2];
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	2795
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	2796 params[0] = (void *)[self getRowTitle:(int)[self selectedRow]];
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	2797 params[1] = (void *)[self getRowData:(int)[self selectedRow]];
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	2798
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	2799 _event_handler(self, (NSEvent *)params, 9);
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	2800 }
829 f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	2801 [super keyUp:theEvent];
f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	2802 }
f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	2803
867 139acecd6ca0 Guess I wanted to trap didClickTableColumn instead of mouseDownInHeaderOfTableColumn to avoid spurious events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 866 diff changeset	2804 -(void)tableView:(NSTableView )tableView didClickTableColumn:(NSTableColumn )tableColumn
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	2805 {
7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	2806 NSUInteger index = [tvcols indexOfObject:tableColumn];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	2807
803 8555ac1bcbcd Attempt at implementing column click events. Doesn't seem to work yet but needed to commit before switching to laptop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 802 diff changeset	2808 /* Handler for column click class */
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	2809 _event_handler(self, (NSEvent *)index, 17);
803 8555ac1bcbcd Attempt at implementing column click events. Doesn't seem to work yet but needed to commit before switching to laptop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 802 diff changeset	2810 }
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	2811 -(void)selectionChanged:(id)sender
756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	2812 {
1874 71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2813 void *params[2];
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	2814
1874 71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2815 params[0] = (void *)[self getRowTitle:(int)[self selectedRow]];
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2816 params[1] = (void *)[self getRowData:(int)[self selectedRow]];
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	2817
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	2818 /* Handler for container class */
1874 71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2819 _event_handler(self, (NSEvent *)params, 12);
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	2820 /* Handler for listbox class */
1102 cfe7d2b6bc16 Added DW_INT_TO_POINTER/DW_UINT_TO_POINTER/DW_POINTER_TO_INT/DW_POINTER_TO_UINT macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1101 diff changeset	2821 _event_handler(self, DW_INT_TO_POINTER((int)[self selectedRow]), 11);
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	2822 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2823 -(NSMenu )menuForEvent:(NSEvent )event
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	2824 {
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	2825 int row;
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	2826 NSPoint where = [self convertPoint:[event locationInWindow] fromView:nil];
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	2827 row = (int)[self rowAtPoint:where];
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	2828 _event_handler(self, (NSEvent *)[self getRowTitle:row], 10);
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	2829 return nil;
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	2830 }
1806 eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	2831 -(void)keyDown:(NSEvent *)theEvent
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	2832 {
1809 5efaea897310 Fixed back tab handling for certain controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1808 diff changeset	2833 unichar vk = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
1819 d784b85b632e Change incorrect call to DW_MUTEX_LOCK to DW_MUTEX_UNLOCK in dw_mle_get_size() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1809 diff changeset	2834
1809 5efaea897310 Fixed back tab handling for certain controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1808 diff changeset	2835 if(vk == NSTabCharacter \|\| vk == NSBackTabCharacter)
1806 eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	2836 [self interpretKeyEvents:[NSArray arrayWithObject:theEvent]];
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	2837 [super keyDown:theEvent];
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	2838 }
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	2839 -(void)insertTab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectNextKeyView:self]; }
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	2840 -(void)insertBacktab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectPreviousKeyView:self]; }
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	2841 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	2842 @end
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2843
1100 13ea7575d9e8 Fixed a problem with dw_tree_item_delete() due to earlier tree data storage changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1099 diff changeset	2844 /* Dive into the tree freeing all desired child nodes */
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	2845 void _free_tree_recurse(NSMutableArray node, NSMutableArray item)
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	2846 {
1100 13ea7575d9e8 Fixed a problem with dw_tree_item_delete() due to earlier tree data storage changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1099 diff changeset	2847 if(node && ([node isKindOfClass:[NSArray class]]))
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	2848 {
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	2849 int count = (int)[node count];
1100 13ea7575d9e8 Fixed a problem with dw_tree_item_delete() due to earlier tree data storage changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1099 diff changeset	2850 NSInteger index = -1;
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	2851 int z;
1128 7d7535f6bc4e Added ability to set background color of MLE; setting foreground still outstanding. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1120 diff changeset	2852
1100 13ea7575d9e8 Fixed a problem with dw_tree_item_delete() due to earlier tree data storage changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1099 diff changeset	2853 if(item)
13ea7575d9e8 Fixed a problem with dw_tree_item_delete() due to earlier tree data storage changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1099 diff changeset	2854 index = [node indexOfObject:item];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2855
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	2856 for(z=0;z<count;z++)
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	2857 {
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	2858 NSMutableArray *pnt = [node objectAtIndex:z];
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	2859 NSMutableArray *children = nil;
1068 efaa9ceeb253 Removed test for class member for itemdata in dw_tree_item_get_data() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1067 diff changeset	2860
1100 13ea7575d9e8 Fixed a problem with dw_tree_item_delete() due to earlier tree data storage changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1099 diff changeset	2861 if(pnt && [pnt isKindOfClass:[NSArray class]])
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	2862 {
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	2863 children = (NSMutableArray *)[pnt objectAtIndex:3];
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	2864 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2865
1100 13ea7575d9e8 Fixed a problem with dw_tree_item_delete() due to earlier tree data storage changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1099 diff changeset	2866 if(z == index)
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	2867 {
1048 70bad8a91370 Fix for dw_tree_item_delete() not working if there are no child nodes on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1045 diff changeset	2868 _free_tree_recurse(children, NULL);
70bad8a91370 Fix for dw_tree_item_delete() not working if there are no child nodes on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1045 diff changeset	2869 [node removeObjectAtIndex:z];
70bad8a91370 Fix for dw_tree_item_delete() not working if there are no child nodes on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1045 diff changeset	2870 count = (int)[node count];
1100 13ea7575d9e8 Fixed a problem with dw_tree_item_delete() due to earlier tree data storage changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1099 diff changeset	2871 index = -1;
1048 70bad8a91370 Fix for dw_tree_item_delete() not working if there are no child nodes on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1045 diff changeset	2872 z--;
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	2873 }
1048 70bad8a91370 Fix for dw_tree_item_delete() not working if there are no child nodes on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1045 diff changeset	2874 else if(item == NULL)
70bad8a91370 Fix for dw_tree_item_delete() not working if there are no child nodes on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1045 diff changeset	2875 {
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	2876 NSString *oldstr = [pnt objectAtIndex:1];
1048 70bad8a91370 Fix for dw_tree_item_delete() not working if there are no child nodes on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1045 diff changeset	2877 [oldstr release];
70bad8a91370 Fix for dw_tree_item_delete() not working if there are no child nodes on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1045 diff changeset	2878 _free_tree_recurse(children, item);
70bad8a91370 Fix for dw_tree_item_delete() not working if there are no child nodes on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1045 diff changeset	2879 }
70bad8a91370 Fix for dw_tree_item_delete() not working if there are no child nodes on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1045 diff changeset	2880 else
70bad8a91370 Fix for dw_tree_item_delete() not working if there are no child nodes on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1045 diff changeset	2881 _free_tree_recurse(children, item);
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	2882 }
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	2883 }
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	2884 if(!item)
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	2885 {
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	2886 [node release];
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	2887 }
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	2888 }
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	2889
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2890 /* Subclass for a Tree type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2891 @interface DWTree : NSOutlineView
719 d5e49ef8f541 Updated the #if for Snow Leopard/Leopard builds to handle them not being defined properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 718 diff changeset	2892 #ifdef BUILDING_FOR_SNOW_LEOPARD
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	2893 <NSOutlineViewDataSource,NSOutlineViewDelegate>
717 17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	2894 #endif
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2895 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2896 void *userdata;
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	2897 NSTableColumn *treecol;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2898 NSMutableArray *data;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2899 /* Each data item consists of a linked lists of tree item data.
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2900 * NSImage , NSString , Item Data , NSMutableArray of Children
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2901 */
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2902 id scrollview;
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	2903 NSColor *fgcolor;
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2904 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2905 -(id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2906 -(BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2907 -(int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2908 -(id)outlineView:(NSOutlineView )outlineView objectValueForTableColumn:(NSTableColumn )tableColumn byItem:(id)item;
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	2909 -(void)outlineView:(NSOutlineView )outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn )tableColumn item:(id)item;
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	2910 -(BOOL)outlineView:(NSOutlineView )outlineView shouldEditTableColumn:(NSTableColumn )tableColumn item:(id)item;
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	2911 -(void)addTree:(NSMutableArray )item and:(NSMutableArray )parent after:(NSMutableArray *)after;
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2912 -(void *)userdata;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2913 -(void)setUserdata:(void *)input;
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	2914 -(void)treeSelectionChanged:(id)sender;
722 5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	2915 -(void)treeItemExpanded:(NSNotification *)notification;
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2916 -(NSScrollView *)scrollview;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2917 -(void)setScrollview:(NSScrollView *)input;
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	2918 -(void)deleteNode:(NSMutableArray *)item;
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	2919 -(void)setForegroundColor:(NSColor *)input;
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	2920 -(void)clear;
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2921 @end
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2922
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2923 @implementation DWTree
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2924 -(id)init
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2925 {
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2926 self = [super init];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2927
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2928 if (self)
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2929 {
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	2930 treecol = [[NSTableColumn alloc] init];
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2931 DWImageAndTextCell *browsercell = [[[DWImageAndTextCell alloc] init] autorelease];
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	2932 [treecol setDataCell:browsercell];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	2933 [self addTableColumn:treecol];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	2934 [self setOutlineTableColumn:treecol];
743 4462bc7de1e3 Possible fix for container (and possibly tree) controls picking up combobox events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 742 diff changeset	2935 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(treeSelectionChanged:) name:NSOutlineViewSelectionDidChangeNotification object:self];
4462bc7de1e3 Possible fix for container (and possibly tree) controls picking up combobox events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 742 diff changeset	2936 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(treeItemExpanded:) name:NSOutlineViewItemDidExpandNotification object:self];
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2937 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2938 return self;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2939 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2940 -(id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2941 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2942 if(item)
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2943 {
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	2944 NSMutableArray *array = [item objectAtIndex:3];
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	2945 return ([array isKindOfClass:[NSNull class]]) ? nil : [array objectAtIndex:index];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2946 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2947 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2948 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2949 return [data objectAtIndex:index];
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2950 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2951 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2952 -(BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2953 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2954 return [self outlineView:outlineView numberOfChildrenOfItem:item] != 0;
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2955 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2956 -(int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2957 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2958 if(item)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2959 {
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	2960 if([item isKindOfClass:[NSMutableArray class]])
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	2961 {
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	2962 NSMutableArray *array = [item objectAtIndex:3];
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	2963 return ([array isKindOfClass:[NSNull class]]) ? 0 : (int)[array count];
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2964 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2965 else
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2966 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2967 return 0;
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2968 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2969 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2970 else
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2971 {
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2972 return data ? (int)[data count] : 0;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2973 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2974 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2975 -(id)outlineView:(NSOutlineView )outlineView objectValueForTableColumn:(NSTableColumn )tableColumn byItem:(id)item
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2976 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2977 if(item)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2978 {
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	2979 if([item isKindOfClass:[NSMutableArray class]])
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	2980 {
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	2981 NSMutableArray this = (NSMutableArray )item;
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	2982 return [this objectAtIndex:1];
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2983 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2984 else
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2985 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2986 return nil;
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2987 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2988 }
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2989 return @"List Root";
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2990 }
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	2991 -(void)outlineView:(NSOutlineView )outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn )tableColumn item:(id)item
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	2992 {
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2993 if([cell isMemberOfClass:[DWImageAndTextCell class]])
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	2994 {
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	2995 NSMutableArray this = (NSMutableArray )item;
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	2996 NSImage *img = [this objectAtIndex:0];
1067 6ca1132a240e Allow tree nodes without icons using the new NSMutableArray tree code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1065 diff changeset	2997 if([img isKindOfClass:[NSImage class]])
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2998 [(DWImageAndTextCell*)cell setImage:img];
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	2999 }
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	3000 }
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	3001 -(BOOL)outlineView:(NSOutlineView )outlineView shouldEditTableColumn:(NSTableColumn )tableColumn item:(id)item { return NO; }
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	3002 -(void)addTree:(NSMutableArray )item and:(NSMutableArray )parent after:(NSMutableArray *)after
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3003 {
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3004 NSMutableArray *children = data;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3005 if(parent)
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3006 {
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	3007 children = [parent objectAtIndex:3];
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	3008 if([children isKindOfClass:[NSNull class]])
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3009 {
692 bd909322f40d Added "retain"s to the DWTree/DWContainer/DWListBox classes memory allocation bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 691 diff changeset	3010 children = [[[NSMutableArray alloc] init] retain];
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	3011 [parent replaceObjectAtIndex:3 withObject:children];
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3012 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3013 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3014 else
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3015 {
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3016 if(!data)
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3017 {
692 bd909322f40d Added "retain"s to the DWTree/DWContainer/DWListBox classes memory allocation bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 691 diff changeset	3018 children = data = [[[NSMutableArray alloc] init] retain];
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3019 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3020 }
1064 b673b25bbd77 Fixed dw_tree_insert_after() so it works on Mac it previously functioned identical to dw_tree_insert(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1063 diff changeset	3021 if(after)
b673b25bbd77 Fixed dw_tree_insert_after() so it works on Mac it previously functioned identical to dw_tree_insert(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1063 diff changeset	3022 {
b673b25bbd77 Fixed dw_tree_insert_after() so it works on Mac it previously functioned identical to dw_tree_insert(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1063 diff changeset	3023 NSInteger index = [children indexOfObject:after];
1100 13ea7575d9e8 Fixed a problem with dw_tree_item_delete() due to earlier tree data storage changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1099 diff changeset	3024 int count = (int)[children count];
13ea7575d9e8 Fixed a problem with dw_tree_item_delete() due to earlier tree data storage changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1099 diff changeset	3025 if(index != NSNotFound && (index+1) < count)
13ea7575d9e8 Fixed a problem with dw_tree_item_delete() due to earlier tree data storage changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1099 diff changeset	3026 [children insertObject:item atIndex:(index+1)];
13ea7575d9e8 Fixed a problem with dw_tree_item_delete() due to earlier tree data storage changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1099 diff changeset	3027 else
13ea7575d9e8 Fixed a problem with dw_tree_item_delete() due to earlier tree data storage changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1099 diff changeset	3028 [children addObject:item];
1064 b673b25bbd77 Fixed dw_tree_insert_after() so it works on Mac it previously functioned identical to dw_tree_insert(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1063 diff changeset	3029 }
b673b25bbd77 Fixed dw_tree_insert_after() so it works on Mac it previously functioned identical to dw_tree_insert(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1063 diff changeset	3030 else
b673b25bbd77 Fixed dw_tree_insert_after() so it works on Mac it previously functioned identical to dw_tree_insert(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1063 diff changeset	3031 {
b673b25bbd77 Fixed dw_tree_insert_after() so it works on Mac it previously functioned identical to dw_tree_insert(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1063 diff changeset	3032 [children addObject:item];
b673b25bbd77 Fixed dw_tree_insert_after() so it works on Mac it previously functioned identical to dw_tree_insert(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1063 diff changeset	3033 }
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3034 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3035 -(void *)userdata { return userdata; }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3036 -(void)setUserdata:(void *)input { userdata = input; }
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	3037 -(void)treeSelectionChanged:(id)sender
5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	3038 {
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	3039 /* Handler for tree class */
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	3040 id item = [self itemAtRow:[self selectedRow]];
5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	3041
713 2c8fc0fd8c11 Don't send tree events with no selected item. Also don't strdup a NULL string. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 712 diff changeset	3042 if(item)
2c8fc0fd8c11 Don't send tree events with no selected item. Also don't strdup a NULL string. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 712 diff changeset	3043 {
2c8fc0fd8c11 Don't send tree events with no selected item. Also don't strdup a NULL string. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 712 diff changeset	3044 _event_handler(self, (void *)item, 12);
2c8fc0fd8c11 Don't send tree events with no selected item. Also don't strdup a NULL string. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 712 diff changeset	3045 }
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	3046 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3047 -(void)treeItemExpanded:(NSNotification *)notification
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3048 {
722 5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	3049 id item = [[notification userInfo ] objectForKey: @"NSObject"];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3050
722 5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	3051 if(item)
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	3052 {
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	3053 _event_handler(self, (void *)item, 16);
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	3054 }
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	3055 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3056 -(NSMenu )menuForEvent:(NSEvent )event
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	3057 {
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	3058 int row;
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	3059 NSPoint where = [self convertPoint:[event locationInWindow] fromView:nil];
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	3060 row = (int)[self rowAtPoint:where];
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	3061 id item = [self itemAtRow:row];
1061 d91e09dc3865 Fix for the item data field of the context event always being NULL even for tree items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1051 diff changeset	3062 _event_handler(self, (NSEvent *)item, 10);
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	3063 return nil;
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	3064 }
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3065 -(NSScrollView *)scrollview { return scrollview; }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3066 -(void)setScrollview:(NSScrollView *)input { scrollview = input; }
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	3067 -(void)deleteNode:(NSMutableArray *)item { _free_tree_recurse(data, item); }
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3068 -(void)setForegroundColor:(NSColor *)input
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3069 {
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	3070 NSTextFieldCell *cell = [treecol dataCell];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3071 fgcolor = input;
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3072 [fgcolor retain];
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	3073 [cell setTextColor:fgcolor];
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	3074 }
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	3075 -(void)clear { NSMutableArray *toclear = data; data = nil; _free_tree_recurse(toclear, NULL); [self reloadData]; }
1806 eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3076 -(void)keyDown:(NSEvent *)theEvent
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3077 {
1809 5efaea897310 Fixed back tab handling for certain controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1808 diff changeset	3078 unichar vk = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
1819 d784b85b632e Change incorrect call to DW_MUTEX_LOCK to DW_MUTEX_UNLOCK in dw_mle_get_size() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1809 diff changeset	3079
1809 5efaea897310 Fixed back tab handling for certain controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1808 diff changeset	3080 if(vk == NSTabCharacter \|\| vk == NSBackTabCharacter)
1806 eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3081 [self interpretKeyEvents:[NSArray arrayWithObject:theEvent]];
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3082 [super keyDown:theEvent];
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3083 }
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3084 -(void)insertTab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectNextKeyView:self]; }
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3085 -(void)insertBacktab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectPreviousKeyView:self]; }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3086 -(void)dealloc
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3087 {
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3088 UserData *root = userdata;
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3089 _remove_userdata(&root, NULL, TRUE);
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3090 _free_tree_recurse(data, NULL);
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	3091 [treecol release];
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	3092 dw_signal_disconnect_by_window(self);
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3093 [super dealloc];
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	3094 }
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3095 @end
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3096
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3097 /* Subclass for a Calendar type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3098 @interface DWCalendar : NSDatePicker
655 27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	3099 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3100 void *userdata;
655 27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	3101 }
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	3102 -(void *)userdata;
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	3103 -(void)setUserdata:(void *)input;
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	3104 @end
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	3105
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	3106 @implementation DWCalendar
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	3107 -(void *)userdata { return userdata; }
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	3108 -(void)setUserdata:(void *)input { userdata = input; }
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	3109 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
655 27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	3110 @end
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	3111
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3112 /* Subclass for a Combobox type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3113 @interface DWComboBox : NSComboBox
719 d5e49ef8f541 Updated the #if for Snow Leopard/Leopard builds to handle them not being defined properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 718 diff changeset	3114 #ifdef BUILDING_FOR_SNOW_LEOPARD
717 17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	3115 <NSComboBoxDelegate>
17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	3116 #endif
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3117 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3118 void *userdata;
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	3119 id clickDefault;
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3120 }
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3121 -(void *)userdata;
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3122 -(void)setUserdata:(void *)input;
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	3123 -(void)comboBoxSelectionDidChange:(NSNotification *)not;
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	3124 -(void)setClickDefault:(id)input;
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3125 @end
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3126
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3127 @implementation DWComboBox
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3128 -(void *)userdata { return userdata; }
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3129 -(void)setUserdata:(void *)input { userdata = input; }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	3130 -(void)comboBoxSelectionDidChange:(NSNotification )not { _event_handler(self, (void )[self indexOfSelectedItem], 11); }
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	3131 -(void)setClickDefault:(id)input { clickDefault = input; }
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3132 -(void)keyUp:(NSEvent *)theEvent
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3133 {
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	3134 if(clickDefault && [[theEvent charactersIgnoringModifiers] characterAtIndex:0] == VK_RETURN)
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3135 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3136 [[self window] makeFirstResponder:clickDefault];
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3137 } else
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3138 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3139 [super keyUp:theEvent];
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3140 }
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	3141 }
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	3142 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3143 @end
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3144
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3145 /* Subclass for a stepper component of the spinbutton type */
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3146 /* This is a bad way of doing this... but I can't get the other methods to work */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3147 @interface DWStepper : NSStepper
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3148 {
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3149 id textfield;
705 7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	3150 id parent;
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3151 }
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3152 -(void)setTextfield:(id)input;
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3153 -(id)textfield;
705 7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	3154 -(void)setParent:(id)input;
7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	3155 -(id)parent;
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3156 -(void)mouseDown:(NSEvent *)event;
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3157 -(void)mouseUp:(NSEvent *)event;
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3158 @end
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3159
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3160 @implementation DWStepper
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3161 -(void)setTextfield:(id)input { textfield = input; }
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3162 -(id)textfield { return textfield; }
705 7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	3163 -(void)setParent:(id)input { parent = input; }
7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	3164 -(id)parent { return parent; }
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3165 -(void)mouseDown:(NSEvent *)event
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3166 {
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3167 [super mouseDown:event];
1940 38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	3168 if([[NSApp currentEvent] type] == DWEventTypeLeftMouseUp)
1302 5fbf384780d1 Simplified the DWStepper class a bit on Mac... although it really needs rewriting. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1301 diff changeset	3169 [self mouseUp:event];
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3170 }
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3171 -(void)mouseUp:(NSEvent *)event
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3172 {
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3173 [textfield takeIntValueFrom:self];
705 7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	3174 _event_handler(parent, (void *)[self integerValue], 14);
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3175 }
1806 eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3176 -(void)keyDown:(NSEvent *)theEvent
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3177 {
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3178 unichar vk = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3179 if(vk == VK_UP \|\| vk == VK_DOWN)
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3180 {
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3181 if(vk == VK_UP)
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3182 [self setIntegerValue:([self integerValue]+[self increment])];
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3183 else
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3184 [self setIntegerValue:([self integerValue]-[self increment])];
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3185 [self mouseUp:theEvent];
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3186 }
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3187 else
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3188 {
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3189 [self interpretKeyEvents:[NSArray arrayWithObject:theEvent]];
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3190 [super keyDown:theEvent];
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3191 }
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3192 }
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3193 -(void)insertTab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectNextKeyView:self]; }
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3194 -(void)insertBacktab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectPreviousKeyView:self]; }
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3195 @end
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3196
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3197 /* Subclass for a Spinbutton type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3198 @interface DWSpinButton : NSView
719 d5e49ef8f541 Updated the #if for Snow Leopard/Leopard builds to handle them not being defined properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 718 diff changeset	3199 #ifdef BUILDING_FOR_SNOW_LEOPARD
717 17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	3200 <NSTextFieldDelegate>
17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	3201 #endif
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3202 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3203 void *userdata;
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3204 NSTextField *textfield;
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3205 DWStepper *stepper;
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	3206 id clickDefault;
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3207 }
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3208 -(id)init;
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3209 -(void *)userdata;
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3210 -(void)setUserdata:(void *)input;
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3211 -(NSTextField *)textfield;
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3212 -(NSStepper *)stepper;
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3213 -(void)controlTextDidChange:(NSNotification *)aNotification;
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	3214 -(void)setClickDefault:(id)input;
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3215 @end
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3216
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3217 @implementation DWSpinButton
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3218 -(id)init
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3219 {
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3220 self = [super init];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3221
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3222 if(self)
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3223 {
1557 030e9bddc1c9 Fixed some potential Objective-C memory leaks on Mac reported by XCode 4.2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	3224 textfield = [[[NSTextField alloc] init] autorelease];
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3225 [self addSubview:textfield];
1557 030e9bddc1c9 Fixed some potential Objective-C memory leaks on Mac reported by XCode 4.2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	3226 stepper = [[[DWStepper alloc] init] autorelease];
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3227 [self addSubview:stepper];
705 7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	3228 [stepper setParent:self];
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3229 [stepper setTextfield:textfield];
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3230 [textfield takeIntValueFrom:stepper];
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3231 [textfield setDelegate:self];
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3232 }
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3233 return self;
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3234 }
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3235 -(void *)userdata { return userdata; }
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3236 -(void)setUserdata:(void *)input { userdata = input; }
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3237 -(NSTextField *)textfield { return textfield; }
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3238 -(NSStepper *)stepper { return stepper; }
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3239 -(void)controlTextDidChange:(NSNotification *)aNotification
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3240 {
d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3241 [stepper takeIntValueFrom:textfield];
705 7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	3242 [textfield takeIntValueFrom:stepper];
7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	3243 _event_handler(self, (void *)[stepper integerValue], 14);
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	3244 }
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	3245 -(void)setClickDefault:(id)input { clickDefault = input; }
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3246 -(void)keyUp:(NSEvent *)theEvent
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3247 {
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	3248 if(clickDefault && [[theEvent charactersIgnoringModifiers] characterAtIndex:0] == VK_RETURN)
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3249 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3250 [[self window] makeFirstResponder:clickDefault];
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3251 }
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3252 else
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3253 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3254 [super keyUp:theEvent];
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3255 }
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	3256 }
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	3257 -(void)performClick:(id)sender { [textfield performClick:sender]; }
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	3258 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3259 @end
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3260
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3261 /* Subclass for a MDI type
684 014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	3262 * This is just a box for display purposes... but it is a
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	3263 * unique class so it can be identified when creating windows.
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	3264 */
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	3265 @interface DWMDI : DWBox {}
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	3266 @end
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	3267
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	3268 @implementation DWMDI
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	3269 @end
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	3270
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3271 /* This function adds a signal handler callback into the linked list.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3272 */
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	3273 void _new_signal(ULONG message, HWND window, int msgid, void signalfunction, void discfunc, void *data)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3274 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3275 SignalHandler *new = malloc(sizeof(SignalHandler));
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3276
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3277 new->message = message;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3278 new->window = window;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3279 new->id = msgid;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3280 new->signalfunction = signalfunction;
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	3281 new->discfunction = discfunc;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3282 new->data = data;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3283 new->next = NULL;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3284
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3285 if (!Root)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3286 Root = new;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3287 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3288 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3289 SignalHandler prev = NULL, tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3290 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3291 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3292 if(tmp->message == message &&
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3293 tmp->window == window &&
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3294 tmp->id == msgid &&
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3295 tmp->signalfunction == signalfunction)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3296 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3297 tmp->data = data;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3298 free(new);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3299 return;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3300 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3301 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3302 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3303 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3304 if(prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3305 prev->next = new;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3306 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3307 Root = new;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3308 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3309 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3310
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3311 /* Finds the message number for a given signal name */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	3312 ULONG _findsigmessage(const char *signame)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3313 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3314 int z;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3315
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3316 for(z=0;z<SIGNALMAX;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3317 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3318 if(strcasecmp(signame, SignalTranslate[z].name) == 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3319 return SignalTranslate[z].message;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3320 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3321 return 0L;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3322 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3323
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3324 unsigned long _foreground = 0xAAAAAA, _background = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3325
916 44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3326 void _handle_resize_events(Box *thisbox)
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3327 {
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3328 int z;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3329
916 44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3330 for(z=0;z<thisbox->count;z++)
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3331 {
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3332 id handle = thisbox->items[z].hwnd;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3333
916 44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3334 if(thisbox->items[z].type == TYPEBOX)
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3335 {
1906 fac81560eb09 Fix a number of warning generated by the new bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1905 diff changeset	3336 Box tmp = (Box )[handle box];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3337
916 44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3338 if(tmp)
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3339 {
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3340 _handle_resize_events(tmp);
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3341 }
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3342 }
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3343 else
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3344 {
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3345 if([handle isMemberOfClass:[DWRender class]])
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3346 {
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3347 DWRender render = (DWRender )handle;
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3348 NSSize oldsize = [render size];
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3349 NSSize newsize = [render frame].size;
1941 b498fb0360fc Mac: 10.14 seems to have drastically changed the drawing mechanism. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1940 diff changeset	3350
b498fb0360fc Mac: 10.14 seems to have drastically changed the drawing mechanism. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1940 diff changeset	3351 /* The 10.14 appkit warns this property does nothing... not sure
b498fb0360fc Mac: 10.14 seems to have drastically changed the drawing mechanism. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1940 diff changeset	3352 * how long that has been the case but just removing it for Mojave.
b498fb0360fc Mac: 10.14 seems to have drastically changed the drawing mechanism. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1940 diff changeset	3353 */
b498fb0360fc Mac: 10.14 seems to have drastically changed the drawing mechanism. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1940 diff changeset	3354 #ifndef BUILDING_FOR_MOJAVE
916 44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3355 NSWindow *window = [render window];
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	3356
916 44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3357 if([window preferredBackingLocation] != NSWindowBackingLocationVideoMemory)
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3358 {
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3359 [window setPreferredBackingLocation:NSWindowBackingLocationVideoMemory];
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3360 }
1941 b498fb0360fc Mac: 10.14 seems to have drastically changed the drawing mechanism. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1940 diff changeset	3361 #endif
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	3362
916 44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3363 /* Eliminate duplicate configure requests */
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3364 if(oldsize.width != newsize.width \|\| oldsize.height != newsize.height)
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3365 {
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3366 if(newsize.width > 0 && newsize.height > 0)
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3367 {
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3368 [render setSize:newsize];
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3369 _event_handler(handle, nil, 1);
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3370 }
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3371 }
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3372 }
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3373 /* Special handling for notebook controls */
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3374 else if([handle isMemberOfClass:[DWNotebook class]])
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3375 {
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3376 DWNotebook notebook = (DWNotebook )handle;
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3377 DWNotebookPage notepage = (DWNotebookPage )[notebook selectedTabViewItem];
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3378 id view = [notepage view];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3379
1805 2bcdc3cfffa7 Make sure the view packed into the notebook on Mac is a DWBox class... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1802 diff changeset	3380 if([view isMemberOfClass:[DWBox class]])
916 44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3381 {
1906 fac81560eb09 Fix a number of warning generated by the new bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1905 diff changeset	3382 Box box = (Box )[view box];
916 44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3383 _handle_resize_events(box);
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3384 }
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3385 }
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3386 /* Handle laying out scrollviews... if required space is less
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3387 * than available space, then expand. Otherwise use required space.
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3388 */
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3389 else if([handle isMemberOfClass:[DWScrollBox class]])
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3390 {
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3391 DWScrollBox scrollbox = (DWScrollBox )handle;
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3392 DWBox *contentbox = [scrollbox documentView];
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3393 Box *thisbox = [contentbox box];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3394
916 44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3395 /* Get the required space for the box */
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3396 _handle_resize_events(thisbox);
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3397 }
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3398 }
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3399 }
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3400 }
44a0f9a2e8f9 Experimental change, pulling the resize event handling out of the resizer code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 915 diff changeset	3401
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3402 /* This function calculates how much space the widgets and boxes require
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3403 * and does expansion as necessary.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3404 */
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3405 static void _resize_box(Box thisbox, int depth, int x, int y, int pass)
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3406 {
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3407 /* Current item position */
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3408 int z, currentx = thisbox->pad, currenty = thisbox->pad;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3409 /* Used x, y and padding maximum values...
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3410 * These will be used to find the widest or
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3411 * tallest items in a box.
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3412 */
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3413 int uymax = 0, uxmax = 0;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3414 int upymax = 0, upxmax = 0;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	3415
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3416 /* Reset the box sizes */
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3417 thisbox->minwidth = thisbox->minheight = thisbox->usedpadx = thisbox->usedpady = thisbox->pad * 2;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3418
798 1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	3419 /* Handle special groupbox case */
1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	3420 if(thisbox->grouphwnd)
1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	3421 {
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3422 /* Only calculate the size on the first pass...
1442 02a329b2b0cd Added groupbox perfomance improvement to Windows and OS/2 that was missed when importing from the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1438 diff changeset	3423 * use the cached values on second.
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3424 */
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3425 if(pass == 1)
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3426 {
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3427 DWGroupBox *groupbox = thisbox->grouphwnd;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3428 NSSize borderSize = [groupbox borderSize];
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3429 NSRect titleRect;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3430
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3431 if(borderSize.width == 0 \|\| borderSize.height == 0)
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3432 {
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3433 borderSize = [groupbox initBorder];
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3434 }
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3435 /* Get the title size for a more accurate groupbox padding size */
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3436 titleRect = [groupbox titleRect];
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3437
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3438 thisbox->grouppadx = borderSize.width;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3439 thisbox->grouppady = borderSize.height + titleRect.size.height;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3440 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	3441
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3442 thisbox->minwidth += thisbox->grouppadx;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3443 thisbox->usedpadx += thisbox->grouppadx;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3444 thisbox->minheight += thisbox->grouppady;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3445 thisbox->usedpady += thisbox->grouppady;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3446 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	3447
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3448 /* Count up all the space for all items in the box */
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3449 for(z=0;z<thisbox->count;z++)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3450 {
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3451 int itempad, itemwidth, itemheight;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	3452
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3453 if(thisbox->items[z].type == TYPEBOX)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3454 {
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	3455 id box = thisbox->items[z].hwnd;
1906 fac81560eb09 Fix a number of warning generated by the new bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1905 diff changeset	3456 Box tmp = (Box )[box box];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3457
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3458 if(tmp)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3459 {
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3460 /* On the first pass calculate the box contents */
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3461 if(pass == 1)
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3462 {
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3463 (*depth)++;
1449 632346743f46 Fixed dw_window_redraw() on Windows not recalculating notebook page contents if the notebook size didn't change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1446 diff changeset	3464
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3465 /* Save the newly calculated values on the box */
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3466 _resize_box(tmp, depth, x, y, pass);
1449 632346743f46 Fixed dw_window_redraw() on Windows not recalculating notebook page contents if the notebook size didn't change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1446 diff changeset	3467
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3468 /* Duplicate the values in the item list for use below */
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3469 thisbox->items[z].width = tmp->minwidth;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3470 thisbox->items[z].height = tmp->minheight;
1449 632346743f46 Fixed dw_window_redraw() on Windows not recalculating notebook page contents if the notebook size didn't change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1446 diff changeset	3471
632346743f46 Fixed dw_window_redraw() on Windows not recalculating notebook page contents if the notebook size didn't change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1446 diff changeset	3472 /* If the box has no contents but is expandable... default the size to 1 */
632346743f46 Fixed dw_window_redraw() on Windows not recalculating notebook page contents if the notebook size didn't change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1446 diff changeset	3473 if(!thisbox->items[z].width && thisbox->items[z].hsize)
632346743f46 Fixed dw_window_redraw() on Windows not recalculating notebook page contents if the notebook size didn't change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1446 diff changeset	3474 thisbox->items[z].width = 1;
632346743f46 Fixed dw_window_redraw() on Windows not recalculating notebook page contents if the notebook size didn't change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1446 diff changeset	3475 if(!thisbox->items[z].height && thisbox->items[z].vsize)
632346743f46 Fixed dw_window_redraw() on Windows not recalculating notebook page contents if the notebook size didn't change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1446 diff changeset	3476 thisbox->items[z].height = 1;
632346743f46 Fixed dw_window_redraw() on Windows not recalculating notebook page contents if the notebook size didn't change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1446 diff changeset	3477
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3478 (*depth)--;
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3479 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3480 }
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3481 }
1449 632346743f46 Fixed dw_window_redraw() on Windows not recalculating notebook page contents if the notebook size didn't change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1446 diff changeset	3482
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3483 /* Precalculate these values, since they will
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3484 * be used used repeatedly in the next section.
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3485 */
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3486 itempad = thisbox->items[z].pad * 2;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3487 itemwidth = thisbox->items[z].width + itempad;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3488 itemheight = thisbox->items[z].height + itempad;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	3489
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3490 /* Calculate the totals and maximums */
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3491 if(thisbox->type == DW_VERT)
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3492 {
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3493 if(itemwidth > uxmax)
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3494 uxmax = itemwidth;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	3495
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3496 if(thisbox->items[z].hsize != SIZEEXPAND)
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3497 {
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3498 if(itemwidth > upxmax)
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3499 upxmax = itemwidth;
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3500 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3501 else
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3502 {
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3503 if(itempad > upxmax)
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3504 upxmax = itempad;
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3505 }
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3506 thisbox->minheight += itemheight;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3507 if(thisbox->items[z].vsize != SIZEEXPAND)
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3508 thisbox->usedpady += itemheight;
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3509 else
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3510 thisbox->usedpady += itempad;
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3511 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3512 else
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3513 {
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3514 if(itemheight > uymax)
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3515 uymax = itemheight;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3516 if(thisbox->items[z].vsize != SIZEEXPAND)
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3517 {
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3518 if(itemheight > upymax)
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3519 upymax = itemheight;
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3520 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3521 else
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3522 {
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3523 if(itempad > upymax)
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3524 upymax = itempad;
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3525 }
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3526 thisbox->minwidth += itemwidth;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3527 if(thisbox->items[z].hsize != SIZEEXPAND)
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3528 thisbox->usedpadx += itemwidth;
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3529 else
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3530 thisbox->usedpadx += itempad;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3531 }
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3532 }
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3533
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3534 /* Add the maximums which were calculated in the previous loop */
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3535 thisbox->minwidth += uxmax;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3536 thisbox->minheight += uymax;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3537 thisbox->usedpadx += upxmax;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3538 thisbox->usedpady += upymax;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3539
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3540 /* The second pass is for actual placement. */
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3541 if(pass > 1)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3542 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3543 for(z=0;z<(thisbox->count);z++)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3544 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3545 int height = thisbox->items[z].height;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3546 int width = thisbox->items[z].width;
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3547 int itempad = thisbox->items[z].pad * 2;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3548 int thispad = thisbox->pad * 2;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3549
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3550 /* Calculate the new sizes */
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3551 if(thisbox->items[z].hsize == SIZEEXPAND)
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3552 {
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3553 if(thisbox->type == DW_HORZ)
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3554 {
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3555 int expandablex = thisbox->minwidth - thisbox->usedpadx;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	3556
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3557 if(expandablex)
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3558 width = (int)(((float)width / (float)expandablex) * (float)(x - thisbox->usedpadx));
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3559 }
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3560 else
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3561 width = x - (itempad + thispad + thisbox->grouppadx);
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3562 }
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3563 if(thisbox->items[z].vsize == SIZEEXPAND)
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	3564 {
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3565 if(thisbox->type == DW_VERT)
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3566 {
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3567 int expandabley = thisbox->minheight - thisbox->usedpady;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	3568
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3569 if(expandabley)
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3570 height = (int)(((float)height / (float)expandabley) * (float)(y - thisbox->usedpady));
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3571 }
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3572 else
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3573 height = y - (itempad + thispad + thisbox->grouppady);
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3574 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	3575
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3576 /* If the calculated size is valid... */
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3577 if(height > 0 && width > 0)
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3578 {
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3579 int pad = thisbox->items[z].pad;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3580 NSView *handle = thisbox->items[z].hwnd;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3581 NSPoint point;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3582 NSSize size;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	3583
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3584 point.x = currentx + pad;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3585 point.y = currenty + pad;
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3586 size.width = width;
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3587 size.height = height;
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3588 [handle setFrameOrigin:point];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3589 [handle setFrameSize:size];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3590
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3591 /* After placing a box... place its components */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3592 if(thisbox->items[z].type == TYPEBOX)
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	3593 {
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3594 id box = thisbox->items[z].hwnd;
1906 fac81560eb09 Fix a number of warning generated by the new bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1905 diff changeset	3595 Box tmp = (Box )[box box];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3596
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3597 if(tmp)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3598 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3599 (*depth)++;
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3600 _resize_box(tmp, depth, width, height, pass);
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3601 (*depth)--;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3602 }
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	3603 }
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3604
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3605 /* Special handling for notebook controls */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3606 if([handle isMemberOfClass:[DWNotebook class]])
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	3607 {
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3608 DWNotebook notebook = (DWNotebook )handle;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3609 DWNotebookPage notepage = (DWNotebookPage )[notebook selectedTabViewItem];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3610 id view = [notepage view];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3611
1805 2bcdc3cfffa7 Make sure the view packed into the notebook on Mac is a DWBox class... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1802 diff changeset	3612 if([view isMemberOfClass:[DWBox class]])
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3613 {
1906 fac81560eb09 Fix a number of warning generated by the new bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1905 diff changeset	3614 Box box = (Box )[view box];
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3615 NSSize size = [view frame].size;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3616 _do_resize(box, size.width, size.height);
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3617 _handle_resize_events(box);
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3618 }
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	3619 }
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3620 /* Handle laying out scrollviews... if required space is less
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3621 * than available space, then expand. Otherwise use required space.
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3622 */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3623 else if([handle isMemberOfClass:[DWScrollBox class]])
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3624 {
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3625 int depth = 0;
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3626 DWScrollBox scrollbox = (DWScrollBox )handle;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3627 DWBox *contentbox = [scrollbox documentView];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3628 Box *thisbox = [contentbox box];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3629 NSSize contentsize = [scrollbox contentSize];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3630
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3631 /* Get the required space for the box */
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3632 _resize_box(thisbox, &depth, x, y, 1);
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3633
a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3634 if(contentsize.width < thisbox->minwidth)
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3635 {
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3636 contentsize.width = thisbox->minwidth;
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3637 }
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3638 if(contentsize.height < thisbox->minheight)
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3639 {
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3640 contentsize.height = thisbox->minheight;
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3641 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3642 [contentbox setFrameSize:contentsize];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3643
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3644 /* Layout the content of the scrollbox */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3645 _do_resize(thisbox, contentsize.width, contentsize.height);
929 d7e88ac1647c Removed some code that had been used for debugging the layout code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 928 diff changeset	3646 _handle_resize_events(thisbox);
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3647 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3648 /* Special handling for spinbutton controls */
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3649 else if([handle isMemberOfClass:[DWSpinButton class]])
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3650 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3651 DWSpinButton spinbutton = (DWSpinButton )handle;
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3652 NSTextField *textfield = [spinbutton textfield];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3653 NSStepper *stepper = [spinbutton stepper];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3654 [textfield setFrameOrigin:NSMakePoint(0,0)];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3655 [textfield setFrameSize:NSMakeSize(size.width-20,size.height)];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3656 [stepper setFrameOrigin:NSMakePoint(size.width-20,0)];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3657 [stepper setFrameSize:NSMakeSize(20,size.height)];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3658 }
1101 d7eafaa054ab Added support for dw_window_redraw() causing splitbar panes to redraw without bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1100 diff changeset	3659 else if([handle isMemberOfClass:[DWSplitBar class]])
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3660 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3661 DWSplitBar split = (DWSplitBar )handle;
1101 d7eafaa054ab Added support for dw_window_redraw() causing splitbar panes to redraw without bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1100 diff changeset	3662 DWWindow window = (DWWindow )[split window];
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3663 float percent = [split percent];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3664
1101 d7eafaa054ab Added support for dw_window_redraw() causing splitbar panes to redraw without bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1100 diff changeset	3665 if(percent > 0 && size.width > 20 && size.height > 20)
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3666 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3667 dw_splitbar_set(handle, percent);
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3668 [split setPercent:0];
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3669 }
1101 d7eafaa054ab Added support for dw_window_redraw() causing splitbar panes to redraw without bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1100 diff changeset	3670 else if([window redraw])
d7eafaa054ab Added support for dw_window_redraw() causing splitbar panes to redraw without bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1100 diff changeset	3671 {
1128 7d7535f6bc4e Added ability to set background color of MLE; setting foreground still outstanding. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1120 diff changeset	3672 [split splitViewDidResizeSubviews:nil];
1101 d7eafaa054ab Added support for dw_window_redraw() causing splitbar panes to redraw without bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1100 diff changeset	3673 }
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3674 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	3675
1438 bde7ebced556 Initial layout engine 2.0 for Windows and OS/2...Plus some updates for the Mac code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1437 diff changeset	3676 /* Advance the current position in the box */
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3677 if(thisbox->type == DW_HORZ)
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3678 currentx += width + (pad * 2);
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3679 if(thisbox->type == DW_VERT)
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3680 currenty += height + (pad * 2);
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3681 }
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3682 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3683 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3684 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3685
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3686 static void _do_resize(Box *thisbox, int x, int y)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3687 {
943 675c12b1b90e Changed check from x and y not being zero to x and y being greater than zero since it seems values can be negative on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 942 diff changeset	3688 if(x > 0 && y > 0)
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3689 {
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3690 if(thisbox)
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3691 {
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3692 int depth = 0;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	3693
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3694 /* Calculate space requirements */
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3695 _resize_box(thisbox, &depth, x, y, 1);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	3696
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3697 /* Finally place all the boxes and controls */
1437 a50e8b486a1a Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1435 diff changeset	3698 _resize_box(thisbox, &depth, x, y, 2);
928 43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3699 }
43a5b3c78c41 Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 927 diff changeset	3700 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3701 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3702
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	3703 NSMenu *_generate_main_menu()
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	3704 {
751 eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	3705 NSString *applicationName = nil;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3706
751 eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	3707 /* This only works on 10.6 so we have a backup method */
719 d5e49ef8f541 Updated the #if for Snow Leopard/Leopard builds to handle them not being defined properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 718 diff changeset	3708 #ifdef BUILDING_FOR_SNOW_LEOPARD
751 eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	3709 applicationName = [[NSRunningApplication currentApplication] localizedName];
717 17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	3710 #endif
751 eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	3711 if(applicationName == nil)
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	3712 {
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	3713 applicationName = [[NSProcessInfo processInfo] processName];
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	3714 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3715
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3716 /* Create the main menu */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3717 NSMenu * mainMenu = [[[NSMenu alloc] initWithTitle:@"MainMenu"] autorelease];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3718
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3719 NSMenuItem * mitem = [mainMenu addItemWithTitle:@"Apple" action:NULL keyEquivalent:@""];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3720 NSMenu * menu = [[[NSMenu alloc] initWithTitle:@"Apple"] autorelease];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3721
1905 0d67f00866b7 A few more warning fixes for OS X 10.10, and a bug fix for the new mac dw_messagebox() code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1904 diff changeset	3722 #if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6)
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3723 [DWApp performSelector:@selector(setAppleMenu:) withObject:menu];
1905 0d67f00866b7 A few more warning fixes for OS X 10.10, and a bug fix for the new mac dw_messagebox() code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1904 diff changeset	3724 #endif
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3725
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3726 /* Setup the Application menu */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3727 NSMenuItem * item = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"About", nil), applicationName]
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3728 action:@selector(orderFrontStandardAboutPanel:)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3729 keyEquivalent:@""];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3730 [item setTarget:DWApp];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3731
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3732 [menu addItem:[NSMenuItem separatorItem]];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3733
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3734 item = [menu addItemWithTitle:NSLocalizedString(@"Services", nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3735 action:NULL
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3736 keyEquivalent:@""];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3737 NSMenu * servicesMenu = [[[NSMenu alloc] initWithTitle:@"Services"] autorelease];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3738 [menu setSubmenu:servicesMenu forItem:item];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3739 [DWApp setServicesMenu:servicesMenu];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3740
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3741 [menu addItem:[NSMenuItem separatorItem]];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3742
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3743 item = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"Hide", nil), applicationName]
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3744 action:@selector(hide:)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3745 keyEquivalent:@"h"];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3746 [item setTarget:DWApp];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3747
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3748 item = [menu addItemWithTitle:NSLocalizedString(@"Hide Others", nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3749 action:@selector(hideOtherApplications:)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3750 keyEquivalent:@"h"];
1940 38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	3751 [item setKeyEquivalentModifierMask:DWEventModifierFlagCommand \| DWEventModifierFlagOption];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3752 [item setTarget:DWApp];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3753
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3754 item = [menu addItemWithTitle:NSLocalizedString(@"Show All", nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3755 action:@selector(unhideAllApplications:)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3756 keyEquivalent:@""];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3757 [item setTarget:DWApp];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3758
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3759 [menu addItem:[NSMenuItem separatorItem]];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3760
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3761 item = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"Quit", nil), applicationName]
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3762 action:@selector(terminate:)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3763 keyEquivalent:@"q"];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3764 [item setTarget:DWApp];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3765
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3766 [mainMenu setSubmenu:menu forItem:mitem];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3767
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3768 return mainMenu;
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	3769 }
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	3770
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	3771 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3772 * Runs a message loop for Dynamic Windows.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3773 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3774 void API dw_main(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3775 {
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	3776 #ifndef BUILDING_FOR_MOJAVE
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3777 dw_mutex_lock(DWRunMutex);
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	3778 #endif
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3779 DWThread = dw_thread_id();
1449 632346743f46 Fixed dw_window_redraw() on Windows not recalculating notebook page contents if the notebook size didn't change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1446 diff changeset	3780 /* Make sure any queued redraws are handled */
632346743f46 Fixed dw_window_redraw() on Windows not recalculating notebook page contents if the notebook size didn't change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1446 diff changeset	3781 _dw_redraw(0, FALSE);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3782 [DWApp run];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3783 DWThread = (DWTID)-1;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	3784 #ifndef BUILDING_FOR_MOJAVE
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	3785 dw_mutex_unlock(DWRunMutex);
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	3786 #endif
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3787 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3788
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3789 /*
1528 5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1527 diff changeset	3790 * Causes running dw_main() to return.
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1527 diff changeset	3791 */
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1527 diff changeset	3792 void API dw_main_quit(void)
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1527 diff changeset	3793 {
1529 92bed442620a Didn't notice that [NSApplication stop] took a sender parameter on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1528 diff changeset	3794 [DWApp stop:nil];
1558 9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	3795 _dw_wakeup_app();
1528 5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1527 diff changeset	3796 }
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1527 diff changeset	3797
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1527 diff changeset	3798 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3799 * Runs a message loop for Dynamic Windows, for a period of milliseconds.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3800 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3801 * milliseconds: Number of milliseconds to run the loop for.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3802 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3803 void API dw_main_sleep(int milliseconds)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3804 {
694 130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	3805 DWTID curr = pthread_self();
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3806
694 130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	3807 if(DWThread == (DWTID)-1 \|\| DWThread == curr)
130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	3808 {
130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	3809 DWTID orig = DWThread;
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	3810 NSDate *until = [NSDate dateWithTimeIntervalSinceNow:(milliseconds/1000.0)];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3811
695 3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	3812 if(orig == (DWTID)-1)
3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	3813 {
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	3814 #ifndef BUILDING_FOR_MOJAVE
728 55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	3815 dw_mutex_lock(DWRunMutex);
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	3816 #endif
695 3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	3817 DWThread = curr;
3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	3818 }
1449 632346743f46 Fixed dw_window_redraw() on Windows not recalculating notebook page contents if the notebook size didn't change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1446 diff changeset	3819 /* Process any pending events */
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	3820 while(_dw_main_iteration(until))
694 130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	3821 {
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	3822 /* Just loop */
695 3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	3823 }
3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	3824 if(orig == (DWTID)-1)
3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	3825 {
3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	3826 DWThread = orig;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	3827 #ifndef BUILDING_FOR_MOJAVE
728 55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	3828 dw_mutex_unlock(DWRunMutex);
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	3829 #endif
694 130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	3830 }
130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	3831 }
130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	3832 else
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	3833 {
694 130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	3834 usleep(milliseconds * 1000);
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	3835 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3836 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3837
700 7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	3838 /* Internal version that doesn't lock the run mutex */
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	3839 int _dw_main_iteration(NSDate *date)
4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	3840 {
1940 38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	3841 NSEvent *event = [DWApp nextEventMatchingMask:DWEventMaskAny
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	3842 untilDate:date
694 130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	3843 inMode:NSDefaultRunLoopMode
130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	3844 dequeue:YES];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3845 if(event)
694 130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	3846 {
130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	3847 [DWApp sendEvent:event];
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	3848 [DWApp updateWindows];
4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	3849 return 1;
694 130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	3850 }
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	3851 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3852 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3853
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3854 /*
700 7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	3855 * Processes a single message iteration and returns.
7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	3856 */
7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	3857 void API dw_main_iteration(void)
7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	3858 {
728 55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	3859 DWTID curr = pthread_self();
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3860
728 55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	3861 if(DWThread == (DWTID)-1)
55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	3862 {
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	3863 #ifndef BUILDING_FOR_MOJAVE
728 55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	3864 dw_mutex_lock(DWRunMutex);
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	3865 #endif
728 55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	3866 DWThread = curr;
55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	3867 _dw_main_iteration([NSDate distantPast]);
55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	3868 DWThread = (DWTID)-1;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	3869 #ifndef BUILDING_FOR_MOJAVE
728 55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	3870 dw_mutex_unlock(DWRunMutex);
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	3871 #endif
728 55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	3872 }
55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	3873 else if(DWThread == curr)
55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	3874 {
55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	3875 _dw_main_iteration([NSDate distantPast]);
55f22b39ab57 Changes to correctly set the main thread and lock the run mutex when not running a loop and when called from a callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 727 diff changeset	3876 }
700 7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	3877 }
7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	3878
7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	3879 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3880 * Cleanly terminates a DW session, should be signal handler safe.
1861 c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	3881 */
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	3882 void API dw_shutdown(void)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3883 {
1559 bc3a11fe9a46 Don't use _dw_pool_drain() in dw_exit() on Mac... that drains and recreates the pool. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1558 diff changeset	3884 #if !defined(GARBAGE_COLLECT)
bc3a11fe9a46 Don't use _dw_pool_drain() in dw_exit() on Mac... that drains and recreates the pool. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1558 diff changeset	3885 pool = pthread_getspecific(_dw_pool_key);
bc3a11fe9a46 Don't use _dw_pool_drain() in dw_exit() on Mac... that drains and recreates the pool. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1558 diff changeset	3886 [pool drain];
bc3a11fe9a46 Don't use _dw_pool_drain() in dw_exit() on Mac... that drains and recreates the pool. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1558 diff changeset	3887 #endif
1861 c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	3888 }
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	3889
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	3890 /*
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	3891 * Cleanly terminates a DW session, should be signal handler safe.
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	3892 * Parameters:
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	3893 * exitcode: Exit code reported to the operating system.
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	3894 */
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	3895 void API dw_exit(int exitcode)
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	3896 {
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	3897 dw_shutdown();
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3898 exit(exitcode);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3899 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3900
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3901 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3902 * Free's memory allocated by dynamic windows.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3903 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3904 * ptr: Pointer to dynamic windows allocated
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3905 * memory to be free()'d.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3906 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3907 void API dw_free(void *ptr)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3908 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3909 free(ptr);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3910 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3911
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3912 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3913 * Returns a pointer to a static buffer which containes the
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3914 * current user directory. Or the root directory (C:\ on
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3915 * OS/2 and Windows).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3916 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3917 char *dw_user_dir(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3918 {
1381 3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	3919 static char _user_dir[PATH_MAX+1] = { 0 };
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3920
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3921 if(!_user_dir[0])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3922 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3923 char *home = getenv("HOME");
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3924
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3925 if(home)
1381 3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	3926 strncpy(_user_dir, home, PATH_MAX);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3927 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3928 strcpy(_user_dir, "/");
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3929 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3930 return _user_dir;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3931 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3932
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3933 /*
1381 3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	3934 * Returns a pointer to a static buffer which containes the
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	3935 * private application data directory.
1381 3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	3936 */
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1383 diff changeset	3937 char * API dw_app_dir(void)
1381 3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	3938 {
3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	3939 return _dw_bundle_path;
3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	3940 }
3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	3941
3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	3942 /*
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1303 diff changeset	3943 * Displays a debug message on the console...
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1303 diff changeset	3944 * Parameters:
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1303 diff changeset	3945 * format: printf style format string.
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1303 diff changeset	3946 * ...: Additional variables for use in the format.
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1303 diff changeset	3947 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	3948 void API dw_debug(const char *format, ...)
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1303 diff changeset	3949 {
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1303 diff changeset	3950 va_list args;
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1303 diff changeset	3951 char outbuf[1025] = {0};
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1303 diff changeset	3952
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1303 diff changeset	3953 va_start(args, format);
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1303 diff changeset	3954 vsnprintf(outbuf, 1024, format, args);
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1303 diff changeset	3955 va_end(args);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	3956
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1303 diff changeset	3957 NSLog(@"%s", outbuf);
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1303 diff changeset	3958 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	3959
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1303 diff changeset	3960 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3961 * Displays a Message Box with given text and title..
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3962 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3963 * title: The title of the message box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3964 * flags: flags to indicate buttons and icon
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3965 * format: printf style format string.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3966 * ...: Additional variables for use in the format.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3967 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	3968 int API dw_messagebox(const char title, int flags, const char format, ...)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3969 {
1895 fafe1a68f0fd Fixed OS X 10.9 issues by migrating to NSAlert from newly deprecated methods. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1887 diff changeset	3970 NSInteger iResponse;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3971 NSString *button1 = @"OK";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3972 NSString *button2 = nil;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3973 NSString *button3 = nil;
1985 8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	3974 NSString *mtitle = [NSString stringWithUTF8String:title];
8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	3975 NSString *mtext;
8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	3976 NSAlertStyle mstyle = DWAlertStyleWarning;
8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	3977 NSArray *params;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3978 va_list args;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3979
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3980 if(flags & DW_MB_OKCANCEL)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3981 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3982 button2 = @"Cancel";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3983 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3984 else if(flags & DW_MB_YESNO)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3985 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3986 button1 = @"Yes";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3987 button2 = @"No";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3988 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3989 else if(flags & DW_MB_YESNOCANCEL)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3990 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3991 button1 = @"Yes";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3992 button2 = @"No";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3993 button3 = @"Cancel";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3994 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3995
1895 fafe1a68f0fd Fixed OS X 10.9 issues by migrating to NSAlert from newly deprecated methods. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1887 diff changeset	3996 va_start(args, format);
1985 8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	3997 mtext = [[[NSString alloc] initWithFormat:[NSString stringWithUTF8String:format] arguments:args] autorelease];
1895 fafe1a68f0fd Fixed OS X 10.9 issues by migrating to NSAlert from newly deprecated methods. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1887 diff changeset	3998 va_end(args);
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	3999
1914 3872ab37297b Fix numerous deprecation warnings building with SDK 10.12 Sierra. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1908 diff changeset	4000 if(flags & DW_MB_ERROR)
1985 8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	4001 mstyle = DWAlertStyleCritical;
1914 3872ab37297b Fix numerous deprecation warnings building with SDK 10.12 Sierra. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1908 diff changeset	4002 else if(flags & DW_MB_INFORMATION)
1985 8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	4003 mstyle = DWAlertStyleInformational;
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	4004
1985 8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	4005 params = [NSMutableArray arrayWithObjects:mtitle, mtext, [NSNumber numberWithInteger:mstyle], button1, button2, button3, nil];
8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	4006 [DWObj safeCall:@selector(messageBox:) withObject:params];
8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	4007 iResponse = [[params lastObject] integerValue];
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	4008
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4009 switch(iResponse)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4010 {
1902 74f50459c530 Fix some deprecations introduced in Mac OS X Yosemite 10.10... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1896 diff changeset	4011 case NSAlertFirstButtonReturn: /* user pressed OK */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4012 if(flags & DW_MB_YESNO \|\| flags & DW_MB_YESNOCANCEL)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4013 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4014 return DW_MB_RETURN_YES;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4015 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4016 return DW_MB_RETURN_OK;
1902 74f50459c530 Fix some deprecations introduced in Mac OS X Yosemite 10.10... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1896 diff changeset	4017 case NSAlertSecondButtonReturn: /* user pressed Cancel */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4018 if(flags & DW_MB_OKCANCEL)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4019 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4020 return DW_MB_RETURN_CANCEL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4021 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4022 return DW_MB_RETURN_NO;
1902 74f50459c530 Fix some deprecations introduced in Mac OS X Yosemite 10.10... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1896 diff changeset	4023 case NSAlertThirdButtonReturn: /* user pressed the third button */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4024 return DW_MB_RETURN_CANCEL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4025 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4026 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4027 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4028
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4029 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4030 * Opens a file dialog and queries user selection.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4031 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4032 * title: Title bar text for dialog.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4033 * defpath: The default path of the open dialog.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4034 * ext: Default file extention.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4035 * flags: DW_FILE_OPEN or DW_FILE_SAVE.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4036 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4037 * NULL on error. A malloced buffer containing
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4038 * the file path on success.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4039 *
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4040 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	4041 char * API dw_file_browse(const char title, const char defpath, const char *ext, int flags)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4042 {
1298 79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4043 char temp[PATH_MAX+1];
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4044 char file = NULL, path = NULL;
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	4045 DW_LOCAL_POOL_IN;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4046
1301 7527fb644bc0 Only use default directory and filename options for Mac 10.6 and higher. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1298 diff changeset	4047 /* Figure out path information...
7527fb644bc0 Only use default directory and filename options for Mac 10.6 and higher. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1298 diff changeset	4048 * These functions are only support in Snow Leopard and later...
7527fb644bc0 Only use default directory and filename options for Mac 10.6 and higher. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1298 diff changeset	4049 */
1704 873304f581be Fix Unicode issues with the directory browser on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1679 diff changeset	4050 if(defpath && *defpath && DWOSMinor > 5)
1298 79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4051 {
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4052 struct stat buf;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4053
1298 79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4054 /* Get an absolute path */
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4055 if(!realpath(defpath, temp))
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4056 strcpy(temp, defpath);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4057
1298 79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4058 /* Check if the defpath exists */
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4059 if(stat(temp, &buf) == 0)
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4060 {
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4061 /* Can be a directory or file */
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4062 if(buf.st_mode & S_IFDIR)
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4063 path = temp;
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4064 else
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4065 file = temp;
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4066 }
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4067 /* If it wasn't a directory... check if there is a path */
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4068 if(!path && strchr(temp, '/'))
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4069 {
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4070 unsigned long x = strlen(temp) - 1;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4071
1298 79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4072 /* Trim off the filename */
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4073 while(x > 0 && temp[x] != '/')
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4074 {
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4075 x--;
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4076 }
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4077 if(temp[x] == '/')
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4078 {
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4079 temp[x] = 0;
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4080 /* Check to make sure the trimmed piece is a directory */
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4081 if(stat(temp, &buf) == 0)
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4082 {
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4083 if(buf.st_mode & S_IFDIR)
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4084 {
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4085 /* We now have it split */
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4086 path = temp;
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4087 file = &temp[x+1];
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4088 }
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4089 }
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4090 }
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4091 }
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4092 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4093
825 8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	4094 if(flags == DW_FILE_OPEN \|\| flags == DW_DIRECTORY_OPEN)
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4095 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4096 /* Create the File Open Dialog class. */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4097 NSOpenPanel* openDlg = [NSOpenPanel openPanel];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4098
1298 79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4099 if(path)
1773 da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4100 {
da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4101 SEL ssdu = NSSelectorFromString(@"setDirectoryURL");
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4102
1773 da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4103 if([openDlg respondsToSelector:ssdu])
da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4104 {
1993 e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	4105 DWIMP isdu = (DWIMP)[openDlg methodForSelector:ssdu];
1773 da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4106 isdu(openDlg, ssdu, [NSURL fileURLWithPath:[NSString stringWithUTF8String:path]]);
da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4107 }
da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4108 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4109
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4110 /* Enable the selection of files in the dialog. */
825 8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	4111 if(flags == DW_FILE_OPEN)
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	4112 {
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	4113 [openDlg setCanChooseFiles:YES];
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	4114 [openDlg setCanChooseDirectories:NO];
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	4115 }
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	4116 else
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	4117 {
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	4118 [openDlg setCanChooseFiles:NO];
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	4119 [openDlg setCanChooseDirectories:YES];
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	4120 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4121
1296 40d62db77c90 Added some defpath support and extension support to the Mac dw_file_browse(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	4122 /* Handle file types */
1704 873304f581be Fix Unicode issues with the directory browser on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1679 diff changeset	4123 if(ext && *ext)
1296 40d62db77c90 Added some defpath support and extension support to the Mac dw_file_browse(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	4124 {
1557 030e9bddc1c9 Fixed some potential Objective-C memory leaks on Mac reported by XCode 4.2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	4125 NSArray* fileTypes = [[[NSArray alloc] initWithObjects:[NSString stringWithUTF8String:ext], nil] autorelease];
1296 40d62db77c90 Added some defpath support and extension support to the Mac dw_file_browse(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	4126 [openDlg setAllowedFileTypes:fileTypes];
40d62db77c90 Added some defpath support and extension support to the Mac dw_file_browse(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	4127 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4128
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4129 /* Disable multiple selection */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4130 [openDlg setAllowsMultipleSelection:NO];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4131
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4132 /* Display the dialog. If the OK button was pressed,
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4133 * process the files.
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4134 */
1903 b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	4135 if([openDlg runModal] == DWModalResponseOK)
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4136 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4137 /* Get an array containing the full filenames of all
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4138 * files and directories selected.
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4139 */
1296 40d62db77c90 Added some defpath support and extension support to the Mac dw_file_browse(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	4140 NSArray *files = [openDlg URLs];
40d62db77c90 Added some defpath support and extension support to the Mac dw_file_browse(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	4141 NSString *fileName = [[files objectAtIndex:0] path];
40d62db77c90 Added some defpath support and extension support to the Mac dw_file_browse(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	4142 if(fileName)
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	4143 {
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	4144 char *ret = strdup([ fileName UTF8String ]);
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	4145 DW_LOCAL_POOL_OUT;
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	4146 return ret;
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	4147 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4148 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4149 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4150 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4151 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4152 /* Create the File Save Dialog class. */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4153 NSSavePanel* saveDlg = [NSSavePanel savePanel];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4154
1298 79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4155 if(path)
1773 da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4156 {
da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4157 SEL ssdu = NSSelectorFromString(@"setDirectoryURL");
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4158
1773 da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4159 if([saveDlg respondsToSelector:ssdu])
da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4160 {
1993 e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	4161 DWIMP isdu = (DWIMP)[saveDlg methodForSelector:ssdu];
1773 da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4162 isdu(saveDlg, ssdu, [NSURL fileURLWithPath:[NSString stringWithUTF8String:path]]);
da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4163 }
da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4164 }
1298 79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4165 if(file)
1773 da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4166 {
da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4167 SEL ssnfsv = NSSelectorFromString(@"setNameFieldStringValue");
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4168
1773 da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4169 if([saveDlg respondsToSelector:ssnfsv])
da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4170 {
1993 e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	4171 DWIMP isnfsv = (DWIMP)[saveDlg methodForSelector:ssnfsv];
1773 da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4172 isnfsv(saveDlg, ssnfsv, [NSString stringWithUTF8String:file]);
da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4173 }
da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4174 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4175
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4176 /* Enable the creation of directories in the dialog. */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4177 [saveDlg setCanCreateDirectories:YES];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4178
1296 40d62db77c90 Added some defpath support and extension support to the Mac dw_file_browse(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	4179 /* Handle file types */
1704 873304f581be Fix Unicode issues with the directory browser on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1679 diff changeset	4180 if(ext && *ext)
1296 40d62db77c90 Added some defpath support and extension support to the Mac dw_file_browse(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	4181 {
1557 030e9bddc1c9 Fixed some potential Objective-C memory leaks on Mac reported by XCode 4.2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	4182 NSArray* fileTypes = [[[NSArray alloc] initWithObjects:[NSString stringWithUTF8String:ext], nil] autorelease];
1296 40d62db77c90 Added some defpath support and extension support to the Mac dw_file_browse(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	4183 [saveDlg setAllowedFileTypes:fileTypes];
40d62db77c90 Added some defpath support and extension support to the Mac dw_file_browse(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	4184 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4185
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4186 /* Display the dialog. If the OK button was pressed,
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4187 * process the files.
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4188 */
2032 5ca399fb2d6f Mac: Put back the delayed setNeedsDisplay workaround for Mojave only. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2031 diff changeset	4189 if([saveDlg runModal] == DWModalResponseOK)
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4190 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4191 /* Get an array containing the full filenames of all
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4192 * files and directories selected.
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4193 */
1296 40d62db77c90 Added some defpath support and extension support to the Mac dw_file_browse(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	4194 NSString* fileName = [[saveDlg URL] path];
40d62db77c90 Added some defpath support and extension support to the Mac dw_file_browse(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	4195 if(fileName)
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	4196 {
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	4197 char *ret = strdup([ fileName UTF8String ]);
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	4198 DW_LOCAL_POOL_OUT;
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	4199 return ret;
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	4200 }
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	4201 }
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	4202 }
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	4203 DW_LOCAL_POOL_OUT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4204 return NULL;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4205 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4206
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4207 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4208 * Gets the contents of the default clipboard as text.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4209 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4210 * None.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4211 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4212 * Pointer to an allocated string of text or NULL if clipboard empty or contents could not
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4213 * be converted to text.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4214 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4215 char *dw_clipboard_get_text()
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4216 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4217 NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	4218 NSString *str = [pasteboard stringForType:NSPasteboardTypeString];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4219 if(str != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4220 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4221 return strdup([ str UTF8String ]);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4222 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4223 return NULL;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4224 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4225
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4226 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4227 * Sets the contents of the default clipboard to the supplied text.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4228 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4229 * Text.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4230 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	4231 void dw_clipboard_set_text(const char *str, int len)
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	4232 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4233 NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
1773 da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4234 SEL scc = NSSelectorFromString(@"clearContents");
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4235
1773 da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4236 if([pasteboard respondsToSelector:scc])
da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4237 {
1993 e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	4238 DWIMP icc = (DWIMP)[pasteboard methodForSelector:scc];
1773 da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	4239 icc(pasteboard, scc);
751 eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	4240 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4241
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	4242 [pasteboard setString:[ NSString stringWithUTF8String:str ] forType:NSPasteboardTypeString];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4243 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4244
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4245
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4246 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4247 * Allocates and initializes a dialog struct.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4248 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4249 * data: User defined data to be passed to functions.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4250 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4251 DWDialog * API dw_dialog_new(void *data)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4252 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4253 DWDialog *tmp = malloc(sizeof(DWDialog));
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4254
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4255 if(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4256 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4257 tmp->eve = dw_event_new();
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4258 dw_event_reset(tmp->eve);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4259 tmp->data = data;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4260 tmp->done = FALSE;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4261 tmp->result = NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4262 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4263 return tmp;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4264 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4265
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4266 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4267 * Accepts a dialog struct and returns the given data to the
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4268 * initial called of dw_dialog_wait().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4269 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4270 * dialog: Pointer to a dialog struct aquired by dw_dialog_new).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4271 * result: Data to be returned by dw_dialog_wait().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4272 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4273 int API dw_dialog_dismiss(DWDialog dialog, void result)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4274 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4275 dialog->result = result;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4276 dw_event_post(dialog->eve);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4277 dialog->done = TRUE;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4278 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4279 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4280
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4281 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4282 * Accepts a dialog struct waits for dw_dialog_dismiss() to be
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4283 * called by a signal handler with the given dialog struct.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4284 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4285 * dialog: Pointer to a dialog struct aquired by dw_dialog_new).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4286 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4287 void * API dw_dialog_wait(DWDialog *dialog)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4288 {
1886 f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	4289 void *tmp = NULL;
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	4290
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	4291 if(dialog)
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	4292 {
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	4293 while(!dialog->done)
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	4294 {
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	4295 _dw_main_iteration([NSDate dateWithTimeIntervalSinceNow:0.01]);
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	4296 }
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	4297 dw_event_close(&dialog->eve);
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	4298 tmp = dialog->result;
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	4299 free(dialog);
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	4300 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4301 return tmp;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4302 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4303
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4304 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4305 * Create a new Box to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4306 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4307 * type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4308 * pad: Number of pixels to pad around the box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4309 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4310 DW_FUNCTION_DEFINITION(dw_box_new, HWND, int type, int pad)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4311 DW_FUNCTION_ADD_PARAM2(type, pad)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4312 DW_FUNCTION_RETURN(dw_box_new, HWND)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4313 DW_FUNCTION_RESTORE_PARAM2(type, int, pad, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4314 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4315 DW_FUNCTION_INIT;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4316 DWBox *view = [[DWBox alloc] init];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4317 Box *newbox = [view box];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4318 memset(newbox, 0, sizeof(Box));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4319 newbox->pad = pad;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4320 newbox->type = type;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4321 DW_FUNCTION_RETURN_THIS(view);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4322 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4323
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4324 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4325 * Create a new Group Box to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4326 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4327 * type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4328 * pad: Number of pixels to pad around the box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4329 * title: Text to be displayined in the group outline.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4330 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	4331 HWND API dw_groupbox_new(int type, int pad, const char *title)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4332 {
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	4333 NSBox *groupbox = [[DWGroupBox alloc] init];
796 3a3fae1f31bd Initial groupbox padding calculation fix. This may still need more work... very simple version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 795 diff changeset	4334 DWBox *thisbox = dw_box_new(type, pad);
3a3fae1f31bd Initial groupbox padding calculation fix. This may still need more work... very simple version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 795 diff changeset	4335 Box *box = [thisbox box];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	4336
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	4337 [groupbox setBorderType:NSBezelBorder];
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	4338 [groupbox setTitle:[NSString stringWithUTF8String:title]];
806 16964b141964 More accurate groupbox paddig calculations. Title rectangle is now calculated on the fly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 805 diff changeset	4339 box->grouphwnd = groupbox;
796 3a3fae1f31bd Initial groupbox padding calculation fix. This may still need more work... very simple version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 795 diff changeset	4340 [groupbox setContentView:thisbox];
1313 9f12bc79924b Autorelease fixes for Mac allowing the objects to dealloc when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1312 diff changeset	4341 [thisbox autorelease];
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	4342 return groupbox;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4343 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4344
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4345 /*
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4346 * Create a new scrollable Box to be packed.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4347 * Parameters:
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4348 * type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4349 * pad: Number of pixels to pad around the box.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4350 */
796 3a3fae1f31bd Initial groupbox padding calculation fix. This may still need more work... very simple version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 795 diff changeset	4351 HWND API dw_scrollbox_new( int type, int pad )
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4352 {
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	4353 DWScrollBox *scrollbox = [[DWScrollBox alloc] init];
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	4354 DWBox *box = dw_box_new(type, pad);
840 2967934fb587 Implemented the fix for the scrollbox problem on the Mac (that was discovered on Windows) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 838 diff changeset	4355 DWBox *tmpbox = dw_box_new(DW_VERT, 0);
2967934fb587 Implemented the fix for the scrollbox problem on the Mac (that was discovered on Windows) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 838 diff changeset	4356 dw_box_pack_start(tmpbox, box, 1, 1, TRUE, TRUE, 0);
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	4357 [scrollbox setHasVerticalScroller:YES];
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	4358 [scrollbox setHasHorizontalScroller:YES];
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	4359 [scrollbox setBorderType:NSNoBorder];
838 8e0405435d0a Minor scrollbox fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 837 diff changeset	4360 [scrollbox setDrawsBackground:NO];
840 2967934fb587 Implemented the fix for the scrollbox problem on the Mac (that was discovered on Windows) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 838 diff changeset	4361 [scrollbox setBox:box];
2967934fb587 Implemented the fix for the scrollbox problem on the Mac (that was discovered on Windows) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 838 diff changeset	4362 [scrollbox setDocumentView:tmpbox];
1313 9f12bc79924b Autorelease fixes for Mac allowing the objects to dealloc when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1312 diff changeset	4363 [tmpbox autorelease];
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	4364 return scrollbox;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4365 }
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4366
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4367 /*
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4368 * Returns the position of the scrollbar in the scrollbox
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4369 * Parameters:
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4370 * handle: Handle to the scrollbox to be queried.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4371 * orient: The vertical or horizontal scrollbar.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4372 */
796 3a3fae1f31bd Initial groupbox padding calculation fix. This may still need more work... very simple version. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 795 diff changeset	4373 int API dw_scrollbox_get_pos(HWND handle, int orient)
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4374 {
844 5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4375 DWScrollBox *scrollbox = handle;
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4376 NSView *view = [scrollbox documentView];
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4377 NSSize contentsize = [scrollbox contentSize];
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4378 NSScroller *scrollbar;
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4379 int range = 0;
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4380 int val = 0;
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4381 if(orient == DW_VERT)
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4382 {
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4383 scrollbar = [scrollbox verticalScroller];
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4384 range = [view bounds].size.height - contentsize.height;
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4385 }
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4386 else
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4387 {
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4388 scrollbar = [scrollbox horizontalScroller];
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4389 range = [view bounds].size.width - contentsize.width;
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4390 }
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4391 if(range > 0)
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4392 {
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4393 val = [scrollbar floatValue] * range;
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4394 }
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4395 return val;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4396 }
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4397
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4398 /*
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4399 * Gets the range for the scrollbar in the scrollbox.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4400 * Parameters:
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4401 * handle: Handle to the scrollbox to be queried.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4402 * orient: The vertical or horizontal scrollbar.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4403 */
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4404 int API dw_scrollbox_get_range(HWND handle, int orient)
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4405 {
844 5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4406 DWScrollBox *scrollbox = handle;
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4407 NSView *view = [scrollbox documentView];
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4408 int range = 0;
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4409 if(orient == DW_VERT)
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4410 {
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4411 range = [view bounds].size.height;
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4412 }
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4413 else
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4414 {
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4415 range = [view bounds].size.width;
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4416 }
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4417 return range;
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4418 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4419
1772 5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	4420 /* Return the handle to the text object */
5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	4421 id _text_handle(id object)
5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	4422 {
5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	4423 if([object isMemberOfClass:[ DWSpinButton class]])
5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	4424 {
5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	4425 DWSpinButton *spinbutton = object;
5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	4426 object = [spinbutton textfield];
5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	4427 }
5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	4428 if([object isMemberOfClass:[ NSBox class]])
5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	4429 {
5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	4430 NSBox *box = object;
5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	4431 id content = [box contentView];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4432
1772 5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	4433 if([content isMemberOfClass:[ DWText class]])
5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	4434 {
5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	4435 object = content;
5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	4436 }
5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	4437 }
5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	4438 return object;
5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	4439 }
5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	4440
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4441 /* Internal function to calculate the widget's required size..
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4442 * These are the general rules for widget sizes:
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4443 *
1537 a4ecef1980db Added code for returning a size for scrolled widgets on OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1533 diff changeset	4444 * Render/Unspecified: 1x1
1556 4a9c574d5c17 Fixed on Windows showing themed static text on colored boxes when the window is glass. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1553 diff changeset	4445 * Scrolled(Container,Tree,MLE): Guessed size clamped to min and max in dw.h
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4446 * Entryfield/Combobox/Spinbutton: 150x(maxfontheight)
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4447 * Spinbutton: 50x(maxfontheight)
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4448 * Text/Status: (textwidth)x(textheight)
1422 131bedf41332 Initial support for automatic redrawing on Windows and ranged/bitmap auto-calculation support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1421 diff changeset	4449 * Ranged: 100x14 or 14x100 for vertical.
131bedf41332 Initial support for automatic redrawing on Windows and ranged/bitmap auto-calculation support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1421 diff changeset	4450 * Buttons/Bitmaps: Size of text or image and border.
131bedf41332 Initial support for automatic redrawing on Windows and ranged/bitmap auto-calculation support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1421 diff changeset	4451 */
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4452 void _control_size(id handle, int width, int height)
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4453 {
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4454 int thiswidth = 1, thisheight = 1, extrawidth = 0, extraheight = 0;
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4455 NSString *nsstr = nil;
1772 5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	4456 id object = _text_handle(handle);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4457
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4458 /* Handle all the different button types */
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4459 if([ object isKindOfClass:[ NSButton class ] ])
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4460 {
1420 fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4461 switch([object buttonType])
fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4462 {
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	4463 case DWButtonTypeSwitch:
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	4464 case DWButtonTypeRadio:
1420 fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4465 extrawidth = 24;
fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4466 extraheight = 4;
fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4467 nsstr = [object title];
fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4468 break;
fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4469 default:
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4470 {
1420 fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4471 NSImage *image = [object image];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4472
1420 fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4473 if(image)
fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4474 {
fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4475 /* Image button */
fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4476 NSSize size = [image size];
fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4477 thiswidth = (int)size.width;
fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4478 thisheight = (int)size.height;
1432 6aa94c8a91de Bordered bitmap buttons need extra padding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	4479 if([object isBordered])
6aa94c8a91de Bordered bitmap buttons need extra padding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	4480 {
6aa94c8a91de Bordered bitmap buttons need extra padding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	4481 extrawidth = 4;
6aa94c8a91de Bordered bitmap buttons need extra padding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	4482 extraheight = 4;
6aa94c8a91de Bordered bitmap buttons need extra padding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	4483 }
1420 fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4484 }
fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4485 else
fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4486 {
fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4487 /* Text button */
fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4488 nsstr = [object title];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4489
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4490 if([object isBordered])
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4491 {
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4492 extrawidth = 30;
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4493 extraheight = 8;
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4494 }
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4495 else
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4496 {
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4497 extrawidth = 8;
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4498 extraheight = 4;
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4499 }
1420 fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4500 }
fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4501 break;
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4502 }
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4503 }
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4504 }
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4505 /* If the control is an entryfield set width to 150 */
1791 ed8851658015 Set status text fields in the test program to auto height... because they were too small on Mac.... this caused me to notice a bug in the calculation of (status) text widgets when the text is empty; this also contains a fix for that bug. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1788 diff changeset	4506 else if([object isKindOfClass:[ NSTextField class ]])
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4507 {
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4508 NSFont *font = [object font];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4509
1791 ed8851658015 Set status text fields in the test program to auto height... because they were too small on Mac.... this caused me to notice a bug in the calculation of (status) text widgets when the text is empty; this also contains a fix for that bug. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1788 diff changeset	4510 if([object isEditable])
ed8851658015 Set status text fields in the test program to auto height... because they were too small on Mac.... this caused me to notice a bug in the calculation of (status) text widgets when the text is empty; this also contains a fix for that bug. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1788 diff changeset	4511 {
ed8851658015 Set status text fields in the test program to auto height... because they were too small on Mac.... this caused me to notice a bug in the calculation of (status) text widgets when the text is empty; this also contains a fix for that bug. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1788 diff changeset	4512 /* Spinbuttons don't need to be as wide */
ed8851658015 Set status text fields in the test program to auto height... because they were too small on Mac.... this caused me to notice a bug in the calculation of (status) text widgets when the text is empty; this also contains a fix for that bug. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1788 diff changeset	4513 if([object isMemberOfClass:[ DWSpinButton class]])
ed8851658015 Set status text fields in the test program to auto height... because they were too small on Mac.... this caused me to notice a bug in the calculation of (status) text widgets when the text is empty; this also contains a fix for that bug. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1788 diff changeset	4514 thiswidth = 50;
ed8851658015 Set status text fields in the test program to auto height... because they were too small on Mac.... this caused me to notice a bug in the calculation of (status) text widgets when the text is empty; this also contains a fix for that bug. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1788 diff changeset	4515 else
ed8851658015 Set status text fields in the test program to auto height... because they were too small on Mac.... this caused me to notice a bug in the calculation of (status) text widgets when the text is empty; this also contains a fix for that bug. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1788 diff changeset	4516 thiswidth = 150;
1908 7e23f3dccb6b Add extra border space to all entryfield controls on Yosemite and higher. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1907 diff changeset	4517 /* Comboboxes need some extra height for the border */
1791 ed8851658015 Set status text fields in the test program to auto height... because they were too small on Mac.... this caused me to notice a bug in the calculation of (status) text widgets when the text is empty; this also contains a fix for that bug. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1788 diff changeset	4518 if([object isMemberOfClass:[ DWComboBox class]])
1908 7e23f3dccb6b Add extra border space to all entryfield controls on Yosemite and higher. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1907 diff changeset	4519 extraheight = 4;
7e23f3dccb6b Add extra border space to all entryfield controls on Yosemite and higher. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1907 diff changeset	4520 /* Yosemite and higher requires even more border space */
7e23f3dccb6b Add extra border space to all entryfield controls on Yosemite and higher. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1907 diff changeset	4521 if(DWOSMinor > 9)
7e23f3dccb6b Add extra border space to all entryfield controls on Yosemite and higher. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1907 diff changeset	4522 extraheight += 4;
1791 ed8851658015 Set status text fields in the test program to auto height... because they were too small on Mac.... this caused me to notice a bug in the calculation of (status) text widgets when the text is empty; this also contains a fix for that bug. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1788 diff changeset	4523 }
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4524 else
1791 ed8851658015 Set status text fields in the test program to auto height... because they were too small on Mac.... this caused me to notice a bug in the calculation of (status) text widgets when the text is empty; this also contains a fix for that bug. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1788 diff changeset	4525 nsstr = [object stringValue];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4526
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4527 if(font)
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4528 thisheight = (int)[font boundingRectForFont].size.height;
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4529 }
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4530 /* Handle the ranged widgets */
1457 c22477fe7347 Split out scrollbars from the rest of the ranged widgets on Mac... the others require extra size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1453 diff changeset	4531 else if([ object isMemberOfClass:[DWPercent class] ] \|\|
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4532 [ object isMemberOfClass:[DWSlider class] ])
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4533 {
1457 c22477fe7347 Split out scrollbars from the rest of the ranged widgets on Mac... the others require extra size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1453 diff changeset	4534 thiswidth = 100;
c22477fe7347 Split out scrollbars from the rest of the ranged widgets on Mac... the others require extra size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1453 diff changeset	4535 thisheight = 20;
c22477fe7347 Split out scrollbars from the rest of the ranged widgets on Mac... the others require extra size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1453 diff changeset	4536 }
c22477fe7347 Split out scrollbars from the rest of the ranged widgets on Mac... the others require extra size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1453 diff changeset	4537 /* Handle the ranged widgets */
c22477fe7347 Split out scrollbars from the rest of the ranged widgets on Mac... the others require extra size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1453 diff changeset	4538 else if([ object isMemberOfClass:[DWScrollbar class] ])
c22477fe7347 Split out scrollbars from the rest of the ranged widgets on Mac... the others require extra size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1453 diff changeset	4539 {
c22477fe7347 Split out scrollbars from the rest of the ranged widgets on Mac... the others require extra size. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1453 diff changeset	4540 if([object vertical])
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4541 {
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4542 thiswidth = 14;
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4543 thisheight = 100;
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4544 }
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4545 else
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4546 {
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4547 thiswidth = 100;
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4548 thisheight = 14;
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4549 }
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4550 }
1421 63d253a2cdd9 Added bitmap autosizing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1420 diff changeset	4551 /* Handle bitmap size */
63d253a2cdd9 Added bitmap autosizing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1420 diff changeset	4552 else if([ object isMemberOfClass:[NSImageView class] ])
63d253a2cdd9 Added bitmap autosizing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1420 diff changeset	4553 {
63d253a2cdd9 Added bitmap autosizing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1420 diff changeset	4554 NSImage *image = [object image];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4555
1421 63d253a2cdd9 Added bitmap autosizing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1420 diff changeset	4556 if(image)
63d253a2cdd9 Added bitmap autosizing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1420 diff changeset	4557 {
63d253a2cdd9 Added bitmap autosizing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1420 diff changeset	4558 NSSize size = [image size];
63d253a2cdd9 Added bitmap autosizing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1420 diff changeset	4559 thiswidth = (int)size.width;
63d253a2cdd9 Added bitmap autosizing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1420 diff changeset	4560 thisheight = (int)size.height;
63d253a2cdd9 Added bitmap autosizing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1420 diff changeset	4561 }
63d253a2cdd9 Added bitmap autosizing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1420 diff changeset	4562 }
1533 7bc189ef0cd0 Add code to determine the size of the calendar control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1531 diff changeset	4563 /* Handle calendar */
7bc189ef0cd0 Add code to determine the size of the calendar control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1531 diff changeset	4564 else if([ object isMemberOfClass:[DWCalendar class] ])
7bc189ef0cd0 Add code to determine the size of the calendar control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1531 diff changeset	4565 {
7bc189ef0cd0 Add code to determine the size of the calendar control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1531 diff changeset	4566 NSCell *cell = [object cell];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4567
1533 7bc189ef0cd0 Add code to determine the size of the calendar control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1531 diff changeset	4568 if(cell)
7bc189ef0cd0 Add code to determine the size of the calendar control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1531 diff changeset	4569 {
7bc189ef0cd0 Add code to determine the size of the calendar control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1531 diff changeset	4570 NSSize size = [cell cellSize];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4571
1533 7bc189ef0cd0 Add code to determine the size of the calendar control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1531 diff changeset	4572 thiswidth = size.width;
7bc189ef0cd0 Add code to determine the size of the calendar control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1531 diff changeset	4573 thisheight = size.height;
7bc189ef0cd0 Add code to determine the size of the calendar control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1531 diff changeset	4574 }
7bc189ef0cd0 Add code to determine the size of the calendar control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1531 diff changeset	4575 }
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4576 /* MLE and Container */
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4577 else if([ object isMemberOfClass:[DWMLE class] ] \|\|
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4578 [ object isMemberOfClass:[DWContainer class] ])
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4579 {
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4580 NSSize size;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4581
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4582 if([ object isMemberOfClass:[DWMLE class] ])
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4583 {
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4584 NSScrollView *sv = [object scrollview];
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4585 NSSize frame = [sv frame].size;
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4586 BOOL hscroll = [sv hasHorizontalScroller];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4587
1552 f00f91d15cbf Added additional code to MLE calculations on Mac to take into account the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1551 diff changeset	4588 /* Make sure word wrap is off for the first part */
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4589 if(!hscroll)
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4590 {
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4591 [[object textContainer] setWidthTracksTextView:NO];
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4592 [[object textContainer] setContainerSize:[object maxSize]];
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4593 [object setHorizontallyResizable:YES];
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4594 [sv setHasHorizontalScroller:YES];
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4595 }
1552 f00f91d15cbf Added additional code to MLE calculations on Mac to take into account the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1551 diff changeset	4596 /* Size the text view to fit */
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4597 [object sizeToFit];
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4598 size = [object bounds].size;
1552 f00f91d15cbf Added additional code to MLE calculations on Mac to take into account the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1551 diff changeset	4599 size.width += 2.0;
f00f91d15cbf Added additional code to MLE calculations on Mac to take into account the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1551 diff changeset	4600 size.height += 2.0;
f00f91d15cbf Added additional code to MLE calculations on Mac to take into account the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1551 diff changeset	4601 /* Re-enable word wrapping if it was on */
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4602 if(!hscroll)
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4603 {
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4604 [[object textContainer] setWidthTracksTextView:YES];
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4605 [sv setHasHorizontalScroller:NO];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4606
1553 46a2123ff570 Cleanup of the previous commits on Mac, don't do more calculations than we need to. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1552 diff changeset	4607 /* If the un wrapped it is beyond the bounds... */
46a2123ff570 Cleanup of the previous commits on Mac, don't do more calculations than we need to. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1552 diff changeset	4608 if(size.width > _DW_SCROLLED_MAX_WIDTH)
46a2123ff570 Cleanup of the previous commits on Mac, don't do more calculations than we need to. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1552 diff changeset	4609 {
46a2123ff570 Cleanup of the previous commits on Mac, don't do more calculations than we need to. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1552 diff changeset	4610 NSSize max = [object maxSize];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4611
1553 46a2123ff570 Cleanup of the previous commits on Mac, don't do more calculations than we need to. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1552 diff changeset	4612 /* Set the max size to the limit */
46a2123ff570 Cleanup of the previous commits on Mac, don't do more calculations than we need to. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1552 diff changeset	4613 [object setMaxSize:NSMakeSize(_DW_SCROLLED_MAX_WIDTH, max.height)];
46a2123ff570 Cleanup of the previous commits on Mac, don't do more calculations than we need to. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1552 diff changeset	4614 /* Recalculate the size */
46a2123ff570 Cleanup of the previous commits on Mac, don't do more calculations than we need to. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1552 diff changeset	4615 [object sizeToFit];
46a2123ff570 Cleanup of the previous commits on Mac, don't do more calculations than we need to. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1552 diff changeset	4616 size = [object bounds].size;
46a2123ff570 Cleanup of the previous commits on Mac, don't do more calculations than we need to. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1552 diff changeset	4617 size.width += 2.0;
46a2123ff570 Cleanup of the previous commits on Mac, don't do more calculations than we need to. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1552 diff changeset	4618 size.height += 2.0;
46a2123ff570 Cleanup of the previous commits on Mac, don't do more calculations than we need to. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1552 diff changeset	4619 [object setMaxSize:max];
46a2123ff570 Cleanup of the previous commits on Mac, don't do more calculations than we need to. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1552 diff changeset	4620 }
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4621 }
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4622 [sv setFrameSize:frame];
1552 f00f91d15cbf Added additional code to MLE calculations on Mac to take into account the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1551 diff changeset	4623 /* Take into account the horizontal scrollbar */
1553 46a2123ff570 Cleanup of the previous commits on Mac, don't do more calculations than we need to. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1552 diff changeset	4624 if(hscroll && size.width > _DW_SCROLLED_MAX_WIDTH)
1552 f00f91d15cbf Added additional code to MLE calculations on Mac to take into account the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1551 diff changeset	4625 size.height += 16.0;
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4626 }
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4627 else
1573 d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	4628 size = [object getsize];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4629
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4630 thiswidth = size.width;
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4631 thisheight = size.height;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4632
1549 ca6be9c48fff Implemented auto-sizing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1543 diff changeset	4633 if(thiswidth < _DW_SCROLLED_MIN_WIDTH)
ca6be9c48fff Implemented auto-sizing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1543 diff changeset	4634 thiswidth = _DW_SCROLLED_MIN_WIDTH;
ca6be9c48fff Implemented auto-sizing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1543 diff changeset	4635 if(thiswidth > _DW_SCROLLED_MAX_WIDTH)
ca6be9c48fff Implemented auto-sizing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1543 diff changeset	4636 thiswidth = _DW_SCROLLED_MAX_WIDTH;
ca6be9c48fff Implemented auto-sizing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1543 diff changeset	4637 if(thisheight < _DW_SCROLLED_MIN_HEIGHT)
ca6be9c48fff Implemented auto-sizing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1543 diff changeset	4638 thisheight = _DW_SCROLLED_MIN_HEIGHT;
ca6be9c48fff Implemented auto-sizing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1543 diff changeset	4639 if(thisheight > _DW_SCROLLED_MAX_HEIGHT)
ca6be9c48fff Implemented auto-sizing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1543 diff changeset	4640 thisheight = _DW_SCROLLED_MAX_HEIGHT;
ca6be9c48fff Implemented auto-sizing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1543 diff changeset	4641 }
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4642 /* Tree */
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4643 else if([ object isMemberOfClass:[DWTree class] ])
1537 a4ecef1980db Added code for returning a size for scrolled widgets on OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1533 diff changeset	4644 {
1566 035bc006afbe Experimental change... halfway between min and max for tree controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1564 diff changeset	4645 thiswidth = (int)((_DW_SCROLLED_MAX_WIDTH + _DW_SCROLLED_MIN_WIDTH)/2);
035bc006afbe Experimental change... halfway between min and max for tree controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1564 diff changeset	4646 thisheight = (int)((_DW_SCROLLED_MAX_HEIGHT + _DW_SCROLLED_MIN_HEIGHT)/2);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4647 }
1533 7bc189ef0cd0 Add code to determine the size of the calendar control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1531 diff changeset	4648 /* Any other control type */
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4649 else if([ object isKindOfClass:[ NSControl class ] ])
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4650 nsstr = [object stringValue];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4651
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4652 /* If we have a string...
1564 d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	4653 * calculate the size with the current font.
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	4654 */
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	4655 if(nsstr && [nsstr length])
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	4656 dw_font_text_extents_get(object, NULL, (char *)[nsstr UTF8String], &thiswidth, &thisheight);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4657
1418 461240f946d0 Status text fields needs extra space on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1411 diff changeset	4658 /* Handle static text fields */
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4659 if([object isKindOfClass:[ NSTextField class ]] && ![object isEditable])
1418 461240f946d0 Status text fields needs extra space on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1411 diff changeset	4660 {
1772 5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	4661 id border = handle;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4662
1778 e71ab68198ce Minor cleanups for the Mac status text changes for 10.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1776 diff changeset	4663 extrawidth = 10;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4664
1418 461240f946d0 Status text fields needs extra space on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1411 diff changeset	4665 /* Handle status bar field */
1772 5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	4666 if([border isMemberOfClass:[ NSBox class ] ])
1564 d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	4667 {
1778 e71ab68198ce Minor cleanups for the Mac status text changes for 10.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1776 diff changeset	4668 extrawidth += 2;
e71ab68198ce Minor cleanups for the Mac status text changes for 10.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1776 diff changeset	4669 extraheight = 8;
e71ab68198ce Minor cleanups for the Mac status text changes for 10.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1776 diff changeset	4670 }
1418 461240f946d0 Status text fields needs extra space on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1411 diff changeset	4671 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4672
1772 5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	4673 /* Set the requested sizes */
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4674 if(width)
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4675 *width = thiswidth + extrawidth;
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4676 if(height)
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4677 *height = thisheight + extraheight;
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4678 }
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4679
1086 4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4680 /* Internal box packing function called by the other 3 functions */
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4681 void _dw_box_pack(HWND box, HWND item, int index, int width, int height, int hsize, int vsize, int pad, char *funcname)
1077 34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4682 {
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4683 //int _locked_by_me = FALSE;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4684 //DW_MUTEX_LOCK;
1077 34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4685 id object = box;
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4686 DWBox *view = box;
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4687 DWBox *this = item;
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4688 Box *thisbox;
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4689 int z, x = 0;
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4690 Item tmpitem, thisitem;
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4691
1086 4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4692 /*
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4693 * If you try and pack an item into itself VERY bad things can happen; like at least an
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4694 * infinite loop on GTK! Lets be safe!
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4695 */
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4696 if(box == item)
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4697 {
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4698 dw_messagebox(funcname, DW_MB_OK\|DW_MB_ERROR, "Danger! Danger! Will Robinson; box and item are the same!");
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4699 return;
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4700 }
1128 7d7535f6bc4e Added ability to set background color of MLE; setting foreground still outstanding. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1120 diff changeset	4701
1077 34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4702 /* Query the objects */
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4703 if([ object isKindOfClass:[ NSWindow class ] ])
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4704 {
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4705 NSWindow *window = box;
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4706 view = [window contentView];
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4707 }
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4708 else if([ object isMemberOfClass:[ DWScrollBox class ] ])
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4709 {
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4710 DWScrollBox *scrollbox = box;
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4711 view = [scrollbox box];
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4712 }
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4713
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4714 thisbox = [view box];
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4715 thisitem = thisbox->items;
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4716 object = item;
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4717
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4718 /* Query the objects */
1543 b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	4719 if([ object isMemberOfClass:[ DWContainer class ] ] \|\|
b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	4720 [ object isMemberOfClass:[ DWTree class ] ] \|\|
b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	4721 [ object isMemberOfClass:[ DWMLE class ] ])
b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	4722 {
b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	4723 this = item = [object scrollview];
1077 34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4724 }
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4725
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4726 /* Do some sanity bounds checking */
1764 5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4727 if(!thisitem)
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4728 thisbox->count = 0;
1077 34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4729 if(index < 0)
1079 5d3acda4acd4 Fixed a minor cut and paste error and formatting on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1077 diff changeset	4730 index = 0;
1077 34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4731 if(index > thisbox->count)
1079 5d3acda4acd4 Fixed a minor cut and paste error and formatting on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1077 diff changeset	4732 index = thisbox->count;
1128 7d7535f6bc4e Added ability to set background color of MLE; setting foreground still outstanding. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1120 diff changeset	4733
1077 34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4734 /* Duplicate the existing data */
1764 5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4735 tmpitem = calloc(sizeof(Item), (thisbox->count+1));
1077 34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4736
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4737 for(z=0;z<thisbox->count;z++)
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4738 {
1079 5d3acda4acd4 Fixed a minor cut and paste error and formatting on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1077 diff changeset	4739 if(z == index)
5d3acda4acd4 Fixed a minor cut and paste error and formatting on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1077 diff changeset	4740 x++;
5d3acda4acd4 Fixed a minor cut and paste error and formatting on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1077 diff changeset	4741 tmpitem[x] = thisitem[z];
5d3acda4acd4 Fixed a minor cut and paste error and formatting on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1077 diff changeset	4742 x++;
1077 34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4743 }
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4744
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4745 /* Sanity checks */
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4746 if(vsize && !height)
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4747 height = 1;
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4748 if(hsize && !width)
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4749 width = 1;
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4750
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4751 /* Fill in the item data appropriately */
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4752 if([object isKindOfClass:[DWBox class]] \|\| [object isMemberOfClass:[DWGroupBox class]])
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4753 tmpitem[index].type = TYPEBOX;
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4754 else
1086 4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4755 {
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4756 if ( width == 0 && hsize == FALSE )
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4757 dw_messagebox(funcname, DW_MB_OK\|DW_MB_ERROR, "Width and expand Horizonal both unset for box: %x item: %x",box,item);
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4758 if ( height == 0 && vsize == FALSE )
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4759 dw_messagebox(funcname, DW_MB_OK\|DW_MB_ERROR, "Height and expand Vertical both unset for box: %x item: %x",box,item);
1128 7d7535f6bc4e Added ability to set background color of MLE; setting foreground still outstanding. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1120 diff changeset	4760
1086 4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4761 tmpitem[index].type = TYPEITEM;
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4762 }
1077 34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4763
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4764 tmpitem[index].hwnd = item;
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4765 tmpitem[index].origwidth = tmpitem[index].width = width;
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4766 tmpitem[index].origheight = tmpitem[index].height = height;
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4767 tmpitem[index].pad = pad;
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4768 tmpitem[index].hsize = hsize ? SIZEEXPAND : SIZESTATIC;
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4769 tmpitem[index].vsize = vsize ? SIZEEXPAND : SIZESTATIC;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4770
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4771 /* If either of the parameters are -1 ... calculate the size */
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4772 if(width == -1 \|\| height == -1)
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4773 _control_size(object, width == -1 ? &tmpitem[index].width : NULL, height == -1 ? &tmpitem[index].height : NULL);
1077 34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4774
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4775 thisbox->items = tmpitem;
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4776
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4777 /* Update the item count */
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4778 thisbox->count++;
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4779
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4780 /* Add the item to the box */
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4781 [view addSubview:this];
1313 9f12bc79924b Autorelease fixes for Mac allowing the objects to dealloc when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1312 diff changeset	4782 /* Enable autorelease on the item...
9f12bc79924b Autorelease fixes for Mac allowing the objects to dealloc when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1312 diff changeset	4783 * so it will get destroyed when the parent is.
9f12bc79924b Autorelease fixes for Mac allowing the objects to dealloc when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1312 diff changeset	4784 */
9f12bc79924b Autorelease fixes for Mac allowing the objects to dealloc when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1312 diff changeset	4785 [this autorelease];
1077 34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4786 /* If we are packing a button... */
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4787 if([this isMemberOfClass:[DWButton class]])
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4788 {
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4789 DWButton button = (DWButton )this;
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4790
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4791 /* Save the parent box so radio
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4792 * buttons can use it later.
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4793 */
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4794 [button setParent:view];
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4795 }
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4796 /* Queue a redraw on the top-level window */
1673 db393069b27d Fix packing padding not triggering automatic redraws on OS/2, Mac and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1672 diff changeset	4797 _dw_redraw([view window], TRUE);
1077 34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4798
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4799 /* Free the old data */
1764 5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4800 if(thisitem)
1077 34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4801 free(thisitem);
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4802 //DW_MUTEX_UNLOCK;
1077 34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4803 }
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4804
34f1d6f5f1c3 Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1075 diff changeset	4805 /*
1671 d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4806 * Remove windows (widgets) from the box they are packed into.
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4807 * Parameters:
1679 e19b93a8229b More comment cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1678 diff changeset	4808 * handle: Window handle of the packed item to be removed.
1671 d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4809 * Returns:
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4810 * DW_ERROR_NONE on success and DW_ERROR_GENERAL on failure.
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4811 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4812 DW_FUNCTION_DEFINITION(dw_box_unpack, int, HWND handle)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4813 DW_FUNCTION_ADD_PARAM1(handle)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4814 DW_FUNCTION_RETURN(dw_box_unpack, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4815 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4816 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4817 DW_FUNCTION_INIT;
1671 d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4818 DW_LOCAL_POOL_IN;
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4819 id object = handle;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4820 int retval = DW_ERROR_NONE;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4821
1671 d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4822 if([object isKindOfClass:[NSView class]] \|\| [object isKindOfClass:[NSControl class]])
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4823 {
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4824 DWBox parent = (DWBox )[object superview];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4825
1671 d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4826 /* Some controls are embedded in scrollviews...
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4827 * so get the parent of the scrollview in that case.
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4828 */
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4829 if(([object isKindOfClass:[NSTableView class]] \|\| [object isMemberOfClass:[DWMLE class]])
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4830 && [parent isMemberOfClass:[NSClipView class]])
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4831 {
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4832 object = [parent superview];
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4833 parent = (DWBox *)[object superview];
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4834 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4835
1671 d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4836 if([parent isKindOfClass:[DWBox class]] \|\| [parent isKindOfClass:[DWGroupBox class]])
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4837 {
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4838 id window = [object window];
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4839 Box *thisbox = [parent box];
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4840 int z, index = -1;
1764 5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4841 Item tmpitem = NULL, thisitem = thisbox->items;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4842
1764 5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4843 if(!thisitem)
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4844 thisbox->count = 0;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4845
1671 d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4846 for(z=0;z<thisbox->count;z++)
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4847 {
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4848 if(thisitem[z].hwnd == object)
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4849 index = z;
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4850 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4851
1671 d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4852 if(index == -1)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4853 retval = DW_ERROR_GENERAL;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4854 else
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4855 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4856 [object retain];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4857 [object removeFromSuperview];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4858
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4859 if(thisbox->count > 1)
1764 5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4860 {
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4861 tmpitem = calloc(sizeof(Item), (thisbox->count-1));
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4862
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4863 /* Copy all but the current entry to the new list */
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4864 for(z=0;z<index;z++)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4865 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4866 tmpitem[z] = thisitem[z];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4867 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4868 for(z=index+1;z<thisbox->count;z++)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4869 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4870 tmpitem[z-1] = thisitem[z];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4871 }
1764 5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4872 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4873
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4874 thisbox->items = tmpitem;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4875 if(thisitem)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4876 free(thisitem);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4877 if(tmpitem)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4878 thisbox->count--;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4879 else
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4880 thisbox->count = 0;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4881 /* Queue a redraw on the top-level window */
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4882 _dw_redraw(window, TRUE);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4883 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4884 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4885 }
1671 d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4886 DW_LOCAL_POOL_OUT;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4887 DW_FUNCTION_RETURN_THIS(retval);
1671 d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4888 }
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4889
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4890 /*
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4891 * Remove windows (widgets) from a box at an arbitrary location.
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4892 * Parameters:
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4893 * box: Window handle of the box to be removed from.
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4894 * index: 0 based index of packed items.
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4895 * Returns:
1679 e19b93a8229b More comment cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1678 diff changeset	4896 * Handle to the removed item on success, 0 on failure or padding.
1671 d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4897 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4898 DW_FUNCTION_DEFINITION(dw_box_unpack_at_index, HWND, HWND box, int index)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4899 DW_FUNCTION_ADD_PARAM2(box, index)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4900 DW_FUNCTION_RETURN(dw_box_unpack_at_index, HWND)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4901 DW_FUNCTION_RESTORE_PARAM2(box, HWND, index, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4902 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4903 DW_FUNCTION_INIT;
1671 d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4904 DW_LOCAL_POOL_IN;
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4905 DWBox parent = (DWBox )box;
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4906 id object = nil;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4907
1671 d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4908 if([parent isKindOfClass:[DWBox class]] \|\| [parent isKindOfClass:[DWGroupBox class]])
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4909 {
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4910 id window = [parent window];
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4911 Box *thisbox = [parent box];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4912
1671 d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4913 if(thisbox && index > -1 && index < thisbox->count)
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4914 {
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4915 int z;
1764 5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4916 Item tmpitem = NULL, thisitem = thisbox->items;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4917
1671 d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4918 object = thisitem[index].hwnd;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4919
1672 42890a2b8d3e Fix minor issues with dw_box_remove_at_index() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1671 diff changeset	4920 if(object)
42890a2b8d3e Fix minor issues with dw_box_remove_at_index() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1671 diff changeset	4921 {
42890a2b8d3e Fix minor issues with dw_box_remove_at_index() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1671 diff changeset	4922 [object retain];
42890a2b8d3e Fix minor issues with dw_box_remove_at_index() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1671 diff changeset	4923 [object removeFromSuperview];
42890a2b8d3e Fix minor issues with dw_box_remove_at_index() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1671 diff changeset	4924 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4925
1764 5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4926 if(thisbox->count > 1)
1671 d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4927 {
1764 5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4928 tmpitem = calloc(sizeof(Item), (thisbox->count-1));
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4929
1764 5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4930 /* Copy all but the current entry to the new list */
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4931 for(z=0;thisitem && z<index;z++)
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4932 {
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4933 tmpitem[z] = thisitem[z];
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4934 }
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4935 for(z=index+1;z<thisbox->count;z++)
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4936 {
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4937 tmpitem[z-1] = thisitem[z];
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4938 }
1671 d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4939 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4940
1671 d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4941 thisbox->items = tmpitem;
1764 5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4942 if(thisitem)
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4943 free(thisitem);
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4944 if(tmpitem)
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4945 thisbox->count--;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4946 else
1764 5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	4947 thisbox->count = 0;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4948
1671 d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4949 /* Queue a redraw on the top-level window */
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4950 _dw_redraw(window, TRUE);
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4951 }
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4952 }
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4953 DW_LOCAL_POOL_OUT;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4954 DW_FUNCTION_RETURN_THIS(object);
1671 d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4955 }
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4956
d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	4957 /*
1086 4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4958 * Pack windows (widgets) into a box at an arbitrary location.
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4959 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4960 * box: Window handle of the box to be packed into.
1678 896f377a47c7 Added exports for building with MinGW on Windows and Watcom on OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1673 diff changeset	4961 * item: Window handle of the item to pack.
1128 7d7535f6bc4e Added ability to set background color of MLE; setting foreground still outstanding. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1120 diff changeset	4962 * index: 0 based index of packed items.
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4963 * width: Width in pixels of the item or -1 to be self determined.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4964 * height: Height in pixels of the item or -1 to be self determined.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4965 * hsize: TRUE if the window (widget) should expand horizontally to fill space given.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4966 * vsize: TRUE if the window (widget) should expand vertically to fill space given.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4967 * pad: Number of pixels of padding around the item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4968 */
1086 4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4969 void API dw_box_pack_at_index(HWND box, HWND item, int index, int width, int height, int hsize, int vsize, int pad)
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4970 {
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4971 _dw_box_pack(box, item, index, width, height, hsize, vsize, pad, "dw_box_pack_at_index()");
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4972 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4973
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4974 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4975 * Pack windows (widgets) into a box from the start (or top).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4976 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4977 * box: Window handle of the box to be packed into.
1678 896f377a47c7 Added exports for building with MinGW on Windows and Watcom on OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1673 diff changeset	4978 * item: Window handle of the item to pack.
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4979 * width: Width in pixels of the item or -1 to be self determined.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4980 * height: Height in pixels of the item or -1 to be self determined.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4981 * hsize: TRUE if the window (widget) should expand horizontally to fill space given.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4982 * vsize: TRUE if the window (widget) should expand vertically to fill space given.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4983 * pad: Number of pixels of padding around the item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4984 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4985 void API dw_box_pack_start(HWND box, HWND item, int width, int height, int hsize, int vsize, int pad)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4986 {
1128 7d7535f6bc4e Added ability to set background color of MLE; setting foreground still outstanding. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1120 diff changeset	4987 /* 65536 is the table limit on GTK...
1086 4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4988 * seems like a high enough value we will never hit it here either.
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4989 */
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4990 _dw_box_pack(box, item, 65536, width, height, hsize, vsize, pad, "dw_box_pack_start()");
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4991 }
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4992
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4993 /*
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4994 * Pack windows (widgets) into a box from the end (or bottom).
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4995 * Parameters:
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4996 * box: Window handle of the box to be packed into.
1678 896f377a47c7 Added exports for building with MinGW on Windows and Watcom on OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1673 diff changeset	4997 * item: Window handle of the item to pack.
1086 4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4998 * width: Width in pixels of the item or -1 to be self determined.
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4999 * height: Height in pixels of the item or -1 to be self determined.
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	5000 * hsize: TRUE if the window (widget) should expand horizontally to fill space given.
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	5001 * vsize: TRUE if the window (widget) should expand vertically to fill space given.
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	5002 * pad: Number of pixels of padding around the item.
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	5003 */
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	5004 void API dw_box_pack_end(HWND box, HWND item, int width, int height, int hsize, int vsize, int pad)
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	5005 {
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	5006 _dw_box_pack(box, item, 0, width, height, hsize, vsize, pad, "dw_box_pack_end()");
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5007 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5008
2037 a00e73284c97 Mac: Continuing const changes. Hopefully last Mac commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2035 diff changeset	5009 HWND _button_new(const char *text, ULONG cid)
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5010 {
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	5011 DWButton *button = [[DWButton alloc] init];
983 6abf763838c6 Allow checboxes and other "buttons" to have a blank title instead of the default "Button" mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 982 diff changeset	5012 if(text)
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	5013 {
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	5014 [button setTitle:[ NSString stringWithUTF8String:text ]];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	5015 }
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	5016 [button setTarget:button];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	5017 [button setAction:@selector(buttonClicked:)];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	5018 [button setTag:cid];
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	5019 [button setButtonType:DWButtonTypeMomentaryPushIn];
1940 38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	5020 [button setBezelStyle:DWBezelStyleRegularSquare];
1093 25707e9f5ad1 Reverted the image scaling on buttons on Mac so it remains consistent on other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1086 diff changeset	5021 /* TODO: Reenable scaling in the future if it is possible on other platforms.
25707e9f5ad1 Reverted the image scaling on buttons on Mac so it remains consistent on other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1086 diff changeset	5022 [[button cell] setImageScaling:NSImageScaleProportionallyDown]; */
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	5023 if(DWDefaultFont)
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	5024 {
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	5025 [[button cell] setFont:DWDefaultFont];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	5026 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5027 return button;
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5028 }
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5029
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5030 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5031 * Create a new button window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5032 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5033 * text: The text to be display by the static text widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5034 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5035 */
2037 a00e73284c97 Mac: Continuing const changes. Hopefully last Mac commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2035 diff changeset	5036 HWND API dw_button_new(const char *text, ULONG cid)
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5037 {
314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5038 DWButton *button = _button_new(text, cid);
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	5039 [button setButtonType:DWButtonTypeMomentaryPushIn];
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	5040 [button setBezelStyle:DWBezelStyleRounded];
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5041 [button setImagePosition:NSNoImage];
1940 38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	5042 [button setAlignment:DWTextAlignmentCenter];
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5043 [[button cell] setControlTint:NSBlueControlTint];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5044 return button;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5045 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5046
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5047 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5048 * Create a new Entryfield window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5049 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5050 * text: The default text to be in the entryfield widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5051 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5052 */
2037 a00e73284c97 Mac: Continuing const changes. Hopefully last Mac commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2035 diff changeset	5053 HWND API dw_entryfield_new(const char *text, ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5054 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5055 DWEntryField *entry = [[DWEntryField alloc] init];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5056 [entry setStringValue:[ NSString stringWithUTF8String:text ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5057 [entry setTag:cid];
1712 daa59fc8d6e5 Disable wrapping on entryfields and static text on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1709 diff changeset	5058 [[entry cell] setScrollable:YES];
daa59fc8d6e5 Disable wrapping on entryfields and static text on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1709 diff changeset	5059 [[entry cell] setWraps:NO];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5060 return entry;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5061 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5062
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5063 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5064 * Create a new Entryfield (password) window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5065 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5066 * text: The default text to be in the entryfield widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5067 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5068 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	5069 HWND API dw_entryfield_password_new(const char *text, ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5070 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5071 DWEntryFieldPassword *entry = [[DWEntryFieldPassword alloc] init];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5072 [entry setStringValue:[ NSString stringWithUTF8String:text ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5073 [entry setTag:cid];
1712 daa59fc8d6e5 Disable wrapping on entryfields and static text on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1709 diff changeset	5074 [[entry cell] setScrollable:YES];
daa59fc8d6e5 Disable wrapping on entryfields and static text on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1709 diff changeset	5075 [[entry cell] setWraps:NO];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5076 return entry;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5077 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5078
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5079 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5080 * Sets the entryfield character limit.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5081 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5082 * handle: Handle to the spinbutton to be set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5083 * limit: Number of characters the entryfield will take.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5084 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5085 void API dw_entryfield_set_limit(HWND handle, ULONG limit)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5086 {
887 29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	5087 DWEntryField *entry = handle;
1557 030e9bddc1c9 Fixed some potential Objective-C memory leaks on Mac reported by XCode 4.2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	5088 DWEntryFieldFormatter *formatter = [[[DWEntryFieldFormatter alloc] init] autorelease];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	5089
887 29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	5090 [formatter setMaximumLength:(int)limit];
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	5091 [[entry cell] setFormatter:formatter];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5092 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5093
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5094 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5095 * Create a new bitmap button window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5096 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5097 * text: Bubble help text to be displayed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5098 * id: An ID of a bitmap in the resource file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5099 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	5100 HWND API dw_bitmapbutton_new(const char *text, ULONG resid)
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5101 {
0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5102 NSBundle *bundle = [NSBundle mainBundle];
0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5103 NSString *respath = [bundle resourcePath];
1770 2396655d43f1 Fix some warnings with Mac 10.8 and Xcode 4.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	5104 NSString *filepath = [respath stringByAppendingFormat:@"/%lu.png", resid];
749 9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	5105 NSImage *image = [[NSImage alloc] initWithContentsOfFile:filepath];
9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	5106 DWButton *button = _button_new("", resid);
748 f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	5107 if(image)
f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	5108 {
f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	5109 [button setImage:image];
f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	5110 }
1396 117cc38a3799 Allow on Mac passing NULL as bubbletext to dw_bitmapbutton_new. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1389 diff changeset	5111 if(text)
117cc38a3799 Allow on Mac passing NULL as bubbletext to dw_bitmapbutton_new. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1389 diff changeset	5112 [button setToolTip:[NSString stringWithUTF8String:text]];
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5113 [image release];
749 9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	5114 return button;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5115 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5116
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5117 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5118 * Create a new bitmap button window (widget) to be packed from a file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5119 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5120 * text: Bubble help text to be displayed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5121 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5122 * filename: Name of the file, omit extention to have
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5123 * DW pick the appropriate file extension.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5124 * (BMP on OS/2 or Windows, XPM on Unix)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5125 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	5126 HWND API dw_bitmapbutton_new_from_file(const char text, unsigned long cid, const char filename)
ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	5127 {
ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	5128 char *ext = _dw_get_image_extension(filename);
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	5129
674 78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	5130 NSString *nstr = [ NSString stringWithUTF8String:filename ];
78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	5131 NSImage *image = [[NSImage alloc] initWithContentsOfFile:nstr];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	5132
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	5133 if(!image && ext)
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	5134 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	5135 nstr = [nstr stringByAppendingString: [NSString stringWithUTF8String:ext]];
674 78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	5136 image = [[NSImage alloc] initWithContentsOfFile:nstr];
78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	5137 }
749 9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	5138 DWButton *button = _button_new("", cid);
748 f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	5139 if(image)
f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	5140 {
f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	5141 [button setImage:image];
f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	5142 }
1396 117cc38a3799 Allow on Mac passing NULL as bubbletext to dw_bitmapbutton_new. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1389 diff changeset	5143 if(text)
117cc38a3799 Allow on Mac passing NULL as bubbletext to dw_bitmapbutton_new. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1389 diff changeset	5144 [button setToolTip:[NSString stringWithUTF8String:text]];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5145 [image release];
749 9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	5146 return button;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5147 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5148
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5149 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5150 * Create a new bitmap button window (widget) to be packed from data.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5151 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5152 * text: Bubble help text to be displayed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5153 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5154 * data: The contents of the image
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5155 * (BMP or ICO on OS/2 or Windows, XPM on Unix)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5156 * len: length of str
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5157 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	5158 HWND API dw_bitmapbutton_new_from_data(const char text, unsigned long cid, const char data, int len)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5159 {
760 2fb17622a455 Possible fix for exception in dw_bitmapbutton_new_from_data() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 755 diff changeset	5160 NSData *thisdata = [NSData dataWithBytes:data length:len];
749 9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	5161 NSImage *image = [[NSImage alloc] initWithData:thisdata];
9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	5162 DWButton *button = _button_new("", cid);
748 f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	5163 if(image)
f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	5164 {
f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	5165 [button setImage:image];
f39745844175 Added tooltips to bitmap buttons... and made a change to the look when the image is present... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 747 diff changeset	5166 }
1396 117cc38a3799 Allow on Mac passing NULL as bubbletext to dw_bitmapbutton_new. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1389 diff changeset	5167 if(text)
117cc38a3799 Allow on Mac passing NULL as bubbletext to dw_bitmapbutton_new. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1389 diff changeset	5168 [button setToolTip:[NSString stringWithUTF8String:text]];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5169 [image release];
749 9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	5170 return button;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5171 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5172
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5173 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5174 * Create a new spinbutton window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5175 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5176 * text: The text to be display by the static text widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5177 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5178 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	5179 HWND API dw_spinbutton_new(const char *text, ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5180 {
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	5181 DWSpinButton *spinbutton = [[DWSpinButton alloc] init];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5182 NSStepper *stepper = [spinbutton stepper];
1023 8188f818eb9f Changed initial spinbutton limits to -65536 to 65536 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1018 diff changeset	5183 NSTextField *textfield = [spinbutton textfield];
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	5184 [stepper setIncrement:1];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5185 [stepper setTag:cid];
1023 8188f818eb9f Changed initial spinbutton limits to -65536 to 65536 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1018 diff changeset	5186 [stepper setMinValue:-65536];
8188f818eb9f Changed initial spinbutton limits to -65536 to 65536 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1018 diff changeset	5187 [stepper setMaxValue:65536];
8188f818eb9f Changed initial spinbutton limits to -65536 to 65536 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1018 diff changeset	5188 [stepper setIntValue:atoi(text)];
8188f818eb9f Changed initial spinbutton limits to -65536 to 65536 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1018 diff changeset	5189 [textfield takeIntValueFrom:stepper];
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	5190 return spinbutton;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5191 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5192
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5193 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5194 * Sets the spinbutton value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5195 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5196 * handle: Handle to the spinbutton to be set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5197 * position: Current value of the spinbutton.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5198 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5199 void API dw_spinbutton_set_pos(HWND handle, long position)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5200 {
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	5201 DWSpinButton *spinbutton = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5202 NSStepper *stepper = [spinbutton stepper];
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	5203 NSTextField *textfield = [spinbutton textfield];
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	5204 [stepper setIntValue:(int)position];
679 d2d7d1802af4 Implemented a rather hacky fix for the spinbutton issues. The stepper control is really poorly bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 678 diff changeset	5205 [textfield takeIntValueFrom:stepper];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5206 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5207
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5208 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5209 * Sets the spinbutton limits.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5210 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5211 * handle: Handle to the spinbutton to be set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5212 * upper: Upper limit.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5213 * lower: Lower limit.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5214 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5215 void API dw_spinbutton_set_limits(HWND handle, long upper, long lower)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5216 {
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	5217 DWSpinButton *spinbutton = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5218 NSStepper *stepper = [spinbutton stepper];
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	5219 [stepper setMinValue:(double)lower];
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	5220 [stepper setMaxValue:(double)upper];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5221 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5222
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5223 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5224 * Returns the current value of the spinbutton.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5225 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5226 * handle: Handle to the spinbutton to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5227 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5228 long API dw_spinbutton_get_pos(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5229 {
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	5230 DWSpinButton *spinbutton = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5231 NSStepper *stepper = [spinbutton stepper];
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	5232 return (long)[stepper integerValue];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5233 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5234
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5235 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5236 * Create a new radiobutton window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5237 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5238 * text: The text to be display by the static text widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5239 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5240 */
2037 a00e73284c97 Mac: Continuing const changes. Hopefully last Mac commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2035 diff changeset	5241 HWND API dw_radiobutton_new(const char *text, ULONG cid)
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5242 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5243 DWButton *button = _button_new(text, cid);
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	5244 [button setButtonType:DWButtonTypeRadio];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5245 return button;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5246 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5247
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5248 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5249 * Create a new slider window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5250 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5251 * vertical: TRUE or FALSE if slider is vertical.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5252 * increments: Number of increments available.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5253 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5254 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5255 HWND API dw_slider_new(int vertical, int increments, ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5256 {
704 336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	5257 DWSlider *slider = [[DWSlider alloc] init];
336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	5258 [slider setMaxValue:(double)increments];
336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	5259 [slider setMinValue:0];
336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	5260 [slider setContinuous:YES];
336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	5261 [slider setTarget:slider];
336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	5262 [slider setAction:@selector(sliderChanged:)];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5263 [slider setTag:cid];
704 336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	5264 return slider;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5265 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5266
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5267 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5268 * Returns the position of the slider.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5269 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5270 * handle: Handle to the slider to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5271 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5272 unsigned int API dw_slider_get_pos(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5273 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5274 DWSlider *slider = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5275 double val = [slider doubleValue];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5276 return (int)val;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5277 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5278
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5279 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5280 * Sets the slider position.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5281 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5282 * handle: Handle to the slider to be set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5283 * position: Position of the slider withing the range.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5284 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5285 void API dw_slider_set_pos(HWND handle, unsigned int position)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5286 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5287 DWSlider *slider = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5288 [slider setDoubleValue:(double)position];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5289 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5290
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5291 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5292 * Create a new scrollbar window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5293 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5294 * vertical: TRUE or FALSE if scrollbar is vertical.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5295 * increments: Number of increments available.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5296 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5297 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5298 HWND API dw_scrollbar_new(int vertical, ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5299 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5300 DWScrollbar *scrollbar;
689 4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	5301 if(vertical)
4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	5302 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5303 scrollbar = [[DWScrollbar alloc] init];
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	5304 [scrollbar setVertical:YES];
689 4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	5305 }
4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	5306 else
4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	5307 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	5308 scrollbar = [[DWScrollbar alloc] initWithFrame:NSMakeRect(0,0,100,5)];
689 4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	5309 }
1941 b498fb0360fc Mac: 10.14 seems to have drastically changed the drawing mechanism. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1940 diff changeset	5310 #ifndef BUILDING_FOR_YOSEMITE
689 4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	5311 [scrollbar setArrowsPosition:NSScrollerArrowsDefaultSetting];
1941 b498fb0360fc Mac: 10.14 seems to have drastically changed the drawing mechanism. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1940 diff changeset	5312 #endif
689 4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	5313 [scrollbar setRange:0.0 andVisible:0.0];
4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	5314 [scrollbar setKnobProportion:1.0];
705 7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	5315 [scrollbar setTarget:scrollbar];
7087f3a294e5 Spinbuttons now respond to value changed. Fix for typing in spinbutton a value out of the range. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 704 diff changeset	5316 [scrollbar setAction:@selector(scrollerChanged:)];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5317 [scrollbar setTag:cid];
689 4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	5318 [scrollbar setEnabled:YES];
4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	5319 return scrollbar;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5320 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5321
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5322 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5323 * Returns the position of the scrollbar.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5324 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5325 * handle: Handle to the scrollbar to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5326 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5327 unsigned int API dw_scrollbar_get_pos(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5328 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5329 DWScrollbar *scrollbar = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5330 float range = [scrollbar range];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5331 float fresult = [scrollbar doubleValue] * range;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5332 return (int)fresult;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5333 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5334
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5335 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5336 * Sets the scrollbar position.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5337 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5338 * handle: Handle to the scrollbar to be set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5339 * position: Position of the scrollbar withing the range.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5340 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5341 void API dw_scrollbar_set_pos(HWND handle, unsigned int position)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5342 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5343 DWScrollbar *scrollbar = handle;
933 b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	5344 double range = [scrollbar range];
b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	5345 double visible = [scrollbar visible];
b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	5346 double newpos = (double)position/(range-visible);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5347 [scrollbar setDoubleValue:newpos];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5348 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5349
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5350 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5351 * Sets the scrollbar range.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5352 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5353 * handle: Handle to the scrollbar to be set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5354 * range: Maximum range value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5355 * visible: Visible area relative to the range.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5356 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5357 void API dw_scrollbar_set_range(HWND handle, unsigned int range, unsigned int visible)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5358 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5359 DWScrollbar *scrollbar = handle;
933 b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	5360 double knob = (double)visible/(double)range;
b19e6e55fc8e Rewrote the scrollbar handler with a more accurate method and fixed a bug setting the position on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 932 diff changeset	5361 [scrollbar setRange:(double)range andVisible:(double)visible];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5362 [scrollbar setKnobProportion:knob];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5363 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5364
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5365 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5366 * Create a new percent bar window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5367 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5368 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5369 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5370 HWND API dw_percent_new(ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5371 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5372 DWPercent *percent = [[DWPercent alloc] init];
1942 5658f703a22e Mac: Finished commiting a fix to NSProgressIndicator deprecations for 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1941 diff changeset	5373 [percent setStyle:DWProgressIndicatorStyleBar];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5374 [percent setBezeled:YES];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5375 [percent setMaxValue:100];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5376 [percent setMinValue:0];
714 cf6246f86c04 Fixed the percent/progress indicators from always being indeterminate. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 713 diff changeset	5377 [percent incrementBy:1];
cf6246f86c04 Fixed the percent/progress indicators from always being indeterminate. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 713 diff changeset	5378 [percent setIndeterminate:NO];
1586 021d2966f84d Make sure the percent widget defaults to 0% on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1582 diff changeset	5379 [percent setDoubleValue:0];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5380 /[percent setTag:cid]; Why doesn't this work? /
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5381 return percent;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5382 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5383
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5384 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5385 * Sets the percent bar position.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5386 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5387 * handle: Handle to the percent bar to be set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5388 * position: Position of the percent bar withing the range.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5389 */
1986 218fce0e3b06 Mac: dw_percent_set_pos() does not update the position when not called from bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1985 diff changeset	5390 DW_FUNCTION_DEFINITION(dw_percent_set_pos, void, HWND handle, unsigned int position)
218fce0e3b06 Mac: dw_percent_set_pos() does not update the position when not called from bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1985 diff changeset	5391 DW_FUNCTION_ADD_PARAM2(handle, position)
218fce0e3b06 Mac: dw_percent_set_pos() does not update the position when not called from bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1985 diff changeset	5392 DW_FUNCTION_NO_RETURN(dw_percent_set_pos)
218fce0e3b06 Mac: dw_percent_set_pos() does not update the position when not called from bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1985 diff changeset	5393 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, position, unsigned int)
218fce0e3b06 Mac: dw_percent_set_pos() does not update the position when not called from bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1985 diff changeset	5394 {
218fce0e3b06 Mac: dw_percent_set_pos() does not update the position when not called from bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1985 diff changeset	5395 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5396 DWPercent *percent = handle;
1190 76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1176 diff changeset	5397
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1176 diff changeset	5398 /* Handle indeterminate */
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1176 diff changeset	5399 if(position == DW_PERCENT_INDETERMINATE)
1193 698875cfe8e5 Fixed the indeterminate percent bar should be animated on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1190 diff changeset	5400 {
1190 76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1176 diff changeset	5401 [percent setIndeterminate:YES];
1193 698875cfe8e5 Fixed the indeterminate percent bar should be animated on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1190 diff changeset	5402 [percent startAnimation:percent];
698875cfe8e5 Fixed the indeterminate percent bar should be animated on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1190 diff changeset	5403 }
1190 76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1176 diff changeset	5404 else
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1176 diff changeset	5405 {
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1176 diff changeset	5406 /* Handle normal */
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1176 diff changeset	5407 if([percent isIndeterminate])
1193 698875cfe8e5 Fixed the indeterminate percent bar should be animated on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1190 diff changeset	5408 {
698875cfe8e5 Fixed the indeterminate percent bar should be animated on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1190 diff changeset	5409 [percent stopAnimation:percent];
1190 76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1176 diff changeset	5410 [percent setIndeterminate:NO];
1193 698875cfe8e5 Fixed the indeterminate percent bar should be animated on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1190 diff changeset	5411 }
1190 76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1176 diff changeset	5412 [percent setDoubleValue:(double)position];
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1176 diff changeset	5413 }
1986 218fce0e3b06 Mac: dw_percent_set_pos() does not update the position when not called from bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1985 diff changeset	5414 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5415 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5416
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5417 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5418 * Create a new checkbox window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5419 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5420 * text: The text to be display by the static text widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5421 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5422 */
2037 a00e73284c97 Mac: Continuing const changes. Hopefully last Mac commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2035 diff changeset	5423 HWND API dw_checkbox_new(const char *text, ULONG cid)
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5424 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5425 DWButton *button = _button_new(text, cid);
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	5426 [button setButtonType:DWButtonTypeSwitch];
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	5427 [button setBezelStyle:DWBezelStyleRegularSquare];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5428 return button;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5429 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5430
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5431 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5432 * Returns the state of the checkbox.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5433 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5434 * handle: Handle to the checkbox to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5435 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5436 int API dw_checkbox_get(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5437 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5438 DWButton *button = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5439 if([button state])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5440 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5441 return TRUE;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5442 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5443 return FALSE;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5444 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5445
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5446 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5447 * Sets the state of the checkbox.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5448 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5449 * handle: Handle to the checkbox to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5450 * value: TRUE for checked, FALSE for unchecked.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5451 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5452 void API dw_checkbox_set(HWND handle, int value)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5453 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5454 DWButton *button = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5455 if(value)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5456 {
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	5457 [button setState:DWControlStateValueOn];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5458 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5459 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5460 {
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	5461 [button setState:DWControlStateValueOff];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5462 }
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	5463
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5464 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5465
658 0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	5466 /* Common code for containers and listboxes */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5467 HWND _cont_new(ULONG cid, int multi)
658 0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	5468 {
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5469 NSScrollView *scrollview = [[NSScrollView alloc] init];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5470 DWContainer *cont = [[DWContainer alloc] init];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5471
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	5472 [cont setScrollview:scrollview];
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	5473 [scrollview setBorderType:NSBezelBorder];
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	5474 [scrollview setHasVerticalScroller:YES];
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	5475 [scrollview setAutohidesScrollers:YES];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5476
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5477 if(multi)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5478 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5479 [cont setAllowsMultipleSelection:YES];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5480 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5481 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5482 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5483 [cont setAllowsMultipleSelection:NO];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5484 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5485 [cont setDataSource:cont];
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	5486 [cont setDelegate:cont];
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	5487 [scrollview setDocumentView:cont];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5488 [cont setTag:cid];
1313 9f12bc79924b Autorelease fixes for Mac allowing the objects to dealloc when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1312 diff changeset	5489 [cont autorelease];
1963 80f6be39b7fe Mac: Miscellaneous container/listox fixes. Add a single pixel to the column bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1959 diff changeset	5490 [cont setRowBgOdd:DW_RGB_TRANSPARENT andEven:DW_RGB_TRANSPARENT];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5491 return cont;
658 0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	5492 }
0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	5493
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5494 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5495 * Create a new listbox window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5496 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5497 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5498 * multi: Multiple select TRUE or FALSE.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5499 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5500 DW_FUNCTION_DEFINITION(dw_listbox_new, HWND, ULONG cid, int multi)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5501 DW_FUNCTION_ADD_PARAM2(cid, multi)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5502 DW_FUNCTION_RETURN(dw_listbox_new, HWND)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5503 DW_FUNCTION_RESTORE_PARAM2(cid, ULONG, multi, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5504 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5505 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5506 DWContainer *cont = _cont_new(cid, multi);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5507 [cont setHeaderView:nil];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5508 int type = DW_CFA_STRING;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5509 [cont setup];
1557 030e9bddc1c9 Fixed some potential Objective-C memory leaks on Mac reported by XCode 4.2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	5510 NSTableColumn *column = [[[NSTableColumn alloc] init] autorelease];
795 f23cad02cfb3 Make listbox, container and tree cells uneditable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 794 diff changeset	5511 [column setEditable:NO];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5512 [cont addTableColumn:column];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5513 [cont addColumn:column andType:type];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5514 DW_FUNCTION_RETURN_THIS(cont)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5515 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5516
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5517 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5518 * Appends the specified text to the listbox's (or combobox) entry list.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5519 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5520 * handle: Handle to the listbox to be appended to.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5521 * text: Text to append into listbox.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5522 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	5523 DW_FUNCTION_DEFINITION(dw_listbox_append, void, HWND handle, const char *text)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5524 DW_FUNCTION_ADD_PARAM2(handle, text)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5525 DW_FUNCTION_NO_RETURN(dw_listbox_append)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5526 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, text, char *)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5527 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5528 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5529 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5530
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5531 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5532 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5533 DWComboBox *combo = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5534
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5535 [combo addItemWithObjectValue:[ NSString stringWithUTF8String:text ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5536 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5537 else if([object isMemberOfClass:[DWContainer class]])
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5538 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5539 DWContainer *cont = handle;
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5540 NSString *nstr = [ NSString stringWithUTF8String:text ];
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5541 NSArray *newrow = [NSArray arrayWithObject:nstr];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5542
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5543 [cont addRow:newrow];
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5544 [cont reloadData];
1963 80f6be39b7fe Mac: Miscellaneous container/listox fixes. Add a single pixel to the column bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1959 diff changeset	5545 [cont optimize];
794 e9bc14c5c72d Test fix for containers (and probably listboxes) not showing their content changes immediately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 793 diff changeset	5546 [cont setNeedsDisplay:YES];
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5547 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5548 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5549 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5550
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5551 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5552 * Inserts the specified text into the listbox's (or combobox) entry list.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5553 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5554 * handle: Handle to the listbox to be inserted into.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5555 * text: Text to insert into listbox.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5556 * pos: 0-based position to insert text
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5557 */
2037 a00e73284c97 Mac: Continuing const changes. Hopefully last Mac commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2035 diff changeset	5558 DW_FUNCTION_DEFINITION(dw_listbox_insert, void, HWND handle, const char *text, int pos)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5559 DW_FUNCTION_ADD_PARAM3(handle, text, pos)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5560 DW_FUNCTION_NO_RETURN(dw_listbox_insert)
2037 a00e73284c97 Mac: Continuing const changes. Hopefully last Mac commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2035 diff changeset	5561 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, text, const char *, pos, int)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5562 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5563 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5564 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5565
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5566 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5567 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5568 DWComboBox *combo = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5569
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5570 [combo insertItemWithObjectValue:[ NSString stringWithUTF8String:text ] atIndex:pos];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5571 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5572 else if([object isMemberOfClass:[DWContainer class]])
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5573 {
687 5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	5574 DWContainer *cont = handle;
5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	5575 NSString *nstr = [ NSString stringWithUTF8String:text ];
5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	5576 NSArray *newrow = [NSArray arrayWithObject:nstr];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5577
687 5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	5578 [cont insertRow:newrow at:pos];
5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	5579 [cont reloadData];
1963 80f6be39b7fe Mac: Miscellaneous container/listox fixes. Add a single pixel to the column bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1959 diff changeset	5580 [cont optimize];
794 e9bc14c5c72d Test fix for containers (and probably listboxes) not showing their content changes immediately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 793 diff changeset	5581 [cont setNeedsDisplay:YES];
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5582 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5583 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5584 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5585
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5586 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5587 * Appends the specified text items to the listbox's (or combobox) entry list.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5588 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5589 * handle: Handle to the listbox to be appended to.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5590 * text: Text strings to append into listbox.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5591 * count: Number of text strings to append
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5592 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5593 DW_FUNCTION_DEFINITION(dw_listbox_list_append, void, HWND handle, char **text, int count)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5594 DW_FUNCTION_ADD_PARAM3(handle, text, count)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5595 DW_FUNCTION_NO_RETURN(dw_listbox_list_append)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5596 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, text, char **, count, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5597 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5598 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5599 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5600
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5601 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5602 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5603 DWComboBox *combo = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5604 int z;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5605
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5606 for(z=0;z<count;z++)
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5607 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5608 [combo addItemWithObjectValue:[ NSString stringWithUTF8String:text[z] ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5609 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5610 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5611 else if([object isMemberOfClass:[DWContainer class]])
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5612 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5613 DWContainer *cont = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5614 int z;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5615
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5616 for(z=0;z<count;z++)
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5617 {
1318 ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	5618 NSString *nstr = [NSString stringWithUTF8String:text[z]];
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	5619 NSArray *newrow = [NSArray arrayWithObjects:nstr,nil];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5620
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5621 [cont addRow:newrow];
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5622 }
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5623 [cont reloadData];
1963 80f6be39b7fe Mac: Miscellaneous container/listox fixes. Add a single pixel to the column bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1959 diff changeset	5624 [cont optimize];
794 e9bc14c5c72d Test fix for containers (and probably listboxes) not showing their content changes immediately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 793 diff changeset	5625 [cont setNeedsDisplay:YES];
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5626 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5627 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5628 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5629
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5630 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5631 * Clears the listbox's (or combobox) list of all entries.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5632 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5633 * handle: Handle to the listbox to be cleared.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5634 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5635 DW_FUNCTION_DEFINITION(dw_listbox_clear, void, HWND handle)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5636 DW_FUNCTION_ADD_PARAM1(handle)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5637 DW_FUNCTION_NO_RETURN(dw_listbox_clear)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5638 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5639 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5640 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5641 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5642
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5643 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5644 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5645 DWComboBox *combo = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5646
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5647 [combo removeAllItems];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5648 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5649 else if([object isMemberOfClass:[DWContainer class]])
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5650 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5651 DWContainer *cont = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5652
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5653 [cont clear];
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5654 [cont reloadData];
794 e9bc14c5c72d Test fix for containers (and probably listboxes) not showing their content changes immediately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 793 diff changeset	5655 [cont setNeedsDisplay:YES];
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5656 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5657 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5658 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5659
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5660 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5661 * Returns the listbox's item count.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5662 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5663 * handle: Handle to the listbox to be cleared.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5664 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5665 DW_FUNCTION_DEFINITION(dw_listbox_count, int, HWND handle)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5666 DW_FUNCTION_ADD_PARAM1(handle)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5667 DW_FUNCTION_RETURN(dw_listbox_count, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5668 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5669 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5670 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5671 id object = handle;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5672 int result = 0;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5673
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5674 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5675 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5676 DWComboBox *combo = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5677
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5678 result = (int)[combo numberOfItems];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5679 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5680 else if([object isMemberOfClass:[DWContainer class]])
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5681 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5682 DWContainer *cont = handle;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5683 result = (int)[cont numberOfRowsInTableView:cont];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5684 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5685 DW_FUNCTION_RETURN_THIS(result);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5686 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5687
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5688 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5689 * Sets the topmost item in the viewport.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5690 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5691 * handle: Handle to the listbox to be cleared.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5692 * top: Index to the top item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5693 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5694 DW_FUNCTION_DEFINITION(dw_listbox_set_top, void, HWND handle, int top)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5695 DW_FUNCTION_ADD_PARAM2(handle, top)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5696 DW_FUNCTION_NO_RETURN(dw_listbox_set_top)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5697 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, top, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5698 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5699 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5700 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5701
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5702 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5703 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5704 DWComboBox *combo = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5705
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5706 [combo scrollItemAtIndexToTop:top];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5707 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5708 else if([object isMemberOfClass:[DWContainer class]])
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5709 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5710 DWContainer *cont = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5711
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5712 [cont scrollRowToVisible:top];
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5713 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5714 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5715 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5716
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5717 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5718 * Copies the given index item's text into buffer.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5719 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5720 * handle: Handle to the listbox to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5721 * index: Index into the list to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5722 * buffer: Buffer where text will be copied.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5723 * length: Length of the buffer (including NULL).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5724 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5725 DW_FUNCTION_DEFINITION(dw_listbox_get_text, void, HWND handle, unsigned int index, char *buffer, unsigned int length)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5726 DW_FUNCTION_ADD_PARAM4(handle, index, buffer, length)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5727 DW_FUNCTION_NO_RETURN(dw_listbox_get_text)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5728 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, index, unsigned int, buffer, char *, length, unsigned int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5729 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5730 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5731 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5732
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5733 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5734 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5735 DWComboBox *combo = handle;
720 357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5736 int count = (int)[combo numberOfItems];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5737
720 357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5738 if(index > count)
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5739 {
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5740 *buffer = '\0';
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5741 }
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5742 else
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5743 {
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5744 NSString *nstr = [combo itemObjectValueAtIndex:index];
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5745 strncpy(buffer, [ nstr UTF8String ], length - 1);
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5746 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5747 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5748 else if([object isMemberOfClass:[DWContainer class]])
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5749 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5750 DWContainer *cont = handle;
720 357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5751 int count = (int)[cont numberOfRowsInTableView:cont];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5752
720 357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5753 if(index > count)
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5754 {
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5755 *buffer = '\0';
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5756 }
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5757 else
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5758 {
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5759 NSString *nstr = [cont getRow:index and:0];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5760
720 357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5761 strncpy(buffer, [ nstr UTF8String ], length - 1);
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5762 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5763 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5764 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5765 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5766
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5767 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5768 * Sets the text of a given listbox entry.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5769 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5770 * handle: Handle to the listbox to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5771 * index: Index into the list to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5772 * buffer: Buffer where text will be copied.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5773 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	5774 DW_FUNCTION_DEFINITION(dw_listbox_set_text, void, HWND handle, unsigned int index, const char *buffer)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5775 DW_FUNCTION_ADD_PARAM3(handle, index, buffer)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5776 DW_FUNCTION_NO_RETURN(dw_listbox_set_text)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5777 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, index, unsigned int, buffer, char *)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5778 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5779 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5780 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5781
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5782 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5783 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5784 DWComboBox *combo = handle;
720 357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5785 int count = (int)[combo numberOfItems];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5786
720 357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5787 if(index <= count)
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5788 {
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5789 [combo removeItemAtIndex:index];
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5790 [combo insertItemWithObjectValue:[ NSString stringWithUTF8String:buffer ] atIndex:index];
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5791 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5792 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5793 else if([object isMemberOfClass:[DWContainer class]])
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5794 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5795 DWContainer *cont = handle;
720 357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5796 int count = (int)[cont numberOfRowsInTableView:cont];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5797
720 357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5798 if(index <= count)
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5799 {
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5800 NSString *nstr = [ NSString stringWithUTF8String:buffer ];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5801
720 357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5802 [cont editCell:nstr at:index and:0];
357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5803 [cont reloadData];
1963 80f6be39b7fe Mac: Miscellaneous container/listox fixes. Add a single pixel to the column bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1959 diff changeset	5804 [cont optimize];
794 e9bc14c5c72d Test fix for containers (and probably listboxes) not showing their content changes immediately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 793 diff changeset	5805 [cont setNeedsDisplay:YES];
720 357b59e57a31 Some fixes for out of range parameters passed to dw_listbox_g/set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 719 diff changeset	5806 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5807 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5808 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5809 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5810
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5811 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5812 * Returns the index to the item in the list currently selected.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5813 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5814 * handle: Handle to the listbox to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5815 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5816 DW_FUNCTION_DEFINITION(dw_listbox_selected, int, HWND handle)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5817 DW_FUNCTION_ADD_PARAM1(handle)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5818 DW_FUNCTION_RETURN(dw_listbox_selected, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5819 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5820 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5821 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5822 id object = handle;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5823 int result = -1;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5824
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5825 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5826 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5827 DWComboBox *combo = handle;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5828 result = (int)[combo indexOfSelectedItem];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5829 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5830 else if([object isMemberOfClass:[DWContainer class]])
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5831 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5832 DWContainer *cont = handle;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5833 result = (int)[cont selectedRow];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5834 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5835 DW_FUNCTION_RETURN_THIS(result);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5836 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5837
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5838 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5839 * Returns the index to the current selected item or -1 when done.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5840 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5841 * handle: Handle to the listbox to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5842 * where: Either the previous return or -1 to restart.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5843 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5844 DW_FUNCTION_DEFINITION(dw_listbox_selected_multi, int, HWND handle, int where)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5845 DW_FUNCTION_ADD_PARAM2(handle, where)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5846 DW_FUNCTION_RETURN(dw_listbox_selected_multi, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5847 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, where, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5848 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5849 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5850 id object = handle;
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5851 int retval = -1;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5852
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5853 if([object isMemberOfClass:[DWContainer class]])
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5854 {
981 536ec60ee433 Don't destroy a pixmap if the handle is null mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 980 diff changeset	5855 NSUInteger result;
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5856 DWContainer *cont = handle;
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5857 NSIndexSet *selected = [cont selectedRowIndexes];
981 536ec60ee433 Don't destroy a pixmap if the handle is null mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 980 diff changeset	5858 if( where == -1 )
536ec60ee433 Don't destroy a pixmap if the handle is null mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 980 diff changeset	5859 result = [selected indexGreaterThanOrEqualToIndex:0];
536ec60ee433 Don't destroy a pixmap if the handle is null mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 980 diff changeset	5860 else
536ec60ee433 Don't destroy a pixmap if the handle is null mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 980 diff changeset	5861 result = [selected indexGreaterThanIndex:where];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5862
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5863 if(result != NSNotFound)
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5864 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5865 retval = (int)result;
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5866 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5867 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5868 DW_FUNCTION_RETURN_THIS(retval)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5869 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5870
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5871 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5872 * Sets the selection state of a given index.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5873 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5874 * handle: Handle to the listbox to be set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5875 * index: Item index.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5876 * state: TRUE if selected FALSE if unselected.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5877 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5878 DW_FUNCTION_DEFINITION(dw_listbox_select, void, HWND handle, int index, int state)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5879 DW_FUNCTION_ADD_PARAM3(handle, index, state)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5880 DW_FUNCTION_NO_RETURN(dw_listbox_select)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5881 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, index, int, state, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5882 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5883 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5884 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5885
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5886 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5887 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5888 DWComboBox *combo = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5889 if(state)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5890 [combo selectItemAtIndex:index];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5891 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5892 [combo deselectItemAtIndex:index];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5893 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5894 else if([object isMemberOfClass:[DWContainer class]])
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5895 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5896 DWContainer *cont = handle;
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5897 NSIndexSet *selected = [[NSIndexSet alloc] initWithIndex:(NSUInteger)index];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5898
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5899 [cont selectRowIndexes:selected byExtendingSelection:YES];
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5900 [selected release];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5901 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5902 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5903 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5904
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5905 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5906 * Deletes the item with given index from the list.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5907 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5908 * handle: Handle to the listbox to be set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5909 * index: Item index.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5910 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5911 DW_FUNCTION_DEFINITION(dw_listbox_delete, void, HWND handle, int index)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5912 DW_FUNCTION_ADD_PARAM2(handle, index)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5913 DW_FUNCTION_NO_RETURN(dw_listbox_delete)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5914 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, index, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5915 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5916 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5917 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5918
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5919 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5920 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5921 DWComboBox *combo = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5922
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5923 [combo removeItemAtIndex:index];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5924 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5925 else if([object isMemberOfClass:[DWContainer class]])
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5926 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5927 DWContainer *cont = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5928
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5929 [cont removeRow:index];
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5930 [cont reloadData];
794 e9bc14c5c72d Test fix for containers (and probably listboxes) not showing their content changes immediately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 793 diff changeset	5931 [cont setNeedsDisplay:YES];
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5932 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5933 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5934 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5935
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5936 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5937 * Create a new Combobox window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5938 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5939 * text: The default text to be in the combpbox widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5940 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5941 */
2037 a00e73284c97 Mac: Continuing const changes. Hopefully last Mac commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2035 diff changeset	5942 DW_FUNCTION_DEFINITION(dw_combobox_new, HWND, const char *text, ULONG cid)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5943 DW_FUNCTION_ADD_PARAM2(text, cid)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5944 DW_FUNCTION_RETURN(dw_combobox_new, HWND)
2037 a00e73284c97 Mac: Continuing const changes. Hopefully last Mac commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2035 diff changeset	5945 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5946 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5947 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5948 DWComboBox *combo = [[DWComboBox alloc] init];
804 5b4a831af8fa Fix for dw_combobox_new() not setting the default text in the entryfield. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 803 diff changeset	5949 [combo setStringValue:[NSString stringWithUTF8String:text]];
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	5950 [combo setDelegate:combo];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5951 [combo setTag:cid];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5952 DW_FUNCTION_RETURN_THIS(combo)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5953 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5954
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5955 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5956 * Create a new Multiline Editbox window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5957 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5958 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5959 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5960 HWND API dw_mle_new(ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5961 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5962 DWMLE *mle = [[DWMLE alloc] init];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5963 NSScrollView *scrollview = [[NSScrollView alloc] init];
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	5964 NSSize size = [mle maxSize];
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	5965
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	5966 size.width = size.height;
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	5967 [mle setMaxSize:size];
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5968 [scrollview setBorderType:NSBezelBorder];
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5969 [scrollview setHasVerticalScroller:YES];
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5970 [scrollview setAutohidesScrollers:YES];
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5971 [scrollview setAutoresizingMask:NSViewWidthSizable\|NSViewHeightSizable];
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	5972 [scrollview setDocumentView:mle];
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	5973 [mle setVerticallyResizable:YES];
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	5974 [mle setAutoresizingMask:NSViewWidthSizable\|NSViewHeightSizable];
1543 b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	5975 [mle setScrollview:scrollview];
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	5976 [mle setAutomaticQuoteSubstitutionEnabled:NO];
a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	5977 [mle setAutomaticDashSubstitutionEnabled:NO];
a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	5978 [mle setAutomaticTextReplacementEnabled:NO];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5979 /* [mle setTag:cid]; Why doesn't this work? */
1313 9f12bc79924b Autorelease fixes for Mac allowing the objects to dealloc when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1312 diff changeset	5980 [mle autorelease];
1543 b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	5981 return mle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5982 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5983
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5984 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5985 * Adds text to an MLE box and returns the current point.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5986 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5987 * handle: Handle to the MLE to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5988 * buffer: Text buffer to be imported.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5989 * startpoint: Point to start entering text.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5990 */
2037 a00e73284c97 Mac: Continuing const changes. Hopefully last Mac commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2035 diff changeset	5991 DW_FUNCTION_DEFINITION(dw_mle_import, unsigned int, HWND handle, const char *buffer, int startpoint)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5992 DW_FUNCTION_ADD_PARAM3(handle, buffer, startpoint)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5993 DW_FUNCTION_RETURN(dw_mle_import, unsigned int)
2037 a00e73284c97 Mac: Continuing const changes. Hopefully last Mac commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2035 diff changeset	5994 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, buffer, const char *, startpoint, int)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5995 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5996 DW_FUNCTION_INIT;
1543 b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	5997 DWMLE *mle = handle;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5998 unsigned int retval;
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	5999 NSTextStorage *ts = [mle textStorage];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6000 NSString *nstr = [NSString stringWithUTF8String:buffer];
1959 9ac432c8620c Mac: Switch to using NSAttributedString with foreground color set to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1958 diff changeset	6001 NSDictionary *attributes = [NSDictionary dictionaryWithObject:NSColor.textColor forKey:NSForegroundColorAttributeName];
9ac432c8620c Mac: Switch to using NSAttributedString with foreground color set to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1958 diff changeset	6002 NSAttributedString *nastr = [[NSAttributedString alloc] initWithString:nstr attributes:attributes];
9ac432c8620c Mac: Switch to using NSAttributedString with foreground color set to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1958 diff changeset	6003 NSUInteger length = [ts length];
992 2d80b4dcff9a A few MLE fixes on the Mac... and a slightly updated dwtest for MLE testing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 989 diff changeset	6004 if(startpoint < 0)
2d80b4dcff9a A few MLE fixes on the Mac... and a slightly updated dwtest for MLE testing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 989 diff changeset	6005 startpoint = 0;
2d80b4dcff9a A few MLE fixes on the Mac... and a slightly updated dwtest for MLE testing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 989 diff changeset	6006 if(startpoint > length)
2d80b4dcff9a A few MLE fixes on the Mac... and a slightly updated dwtest for MLE testing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 989 diff changeset	6007 startpoint = (int)length;
1959 9ac432c8620c Mac: Switch to using NSAttributedString with foreground color set to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1958 diff changeset	6008 [ts insertAttributedString:nastr atIndex:startpoint];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6009 retval = (unsigned int)strlen(buffer) + startpoint;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6010 DW_FUNCTION_RETURN_THIS(retval);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6011 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6012
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6013 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6014 * Grabs text from an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6015 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6016 * handle: Handle to the MLE to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6017 * buffer: Text buffer to be exported.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6018 * startpoint: Point to start grabbing text.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6019 * length: Amount of text to be grabbed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6020 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6021 DW_FUNCTION_DEFINITION(dw_mle_export, void, HWND handle, char *buffer, int startpoint, int length)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6022 DW_FUNCTION_ADD_PARAM4(handle, buffer, startpoint, length)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6023 DW_FUNCTION_NO_RETURN(dw_mle_export)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6024 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, buffer, char *, startpoint, int, length, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6025 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6026 DW_FUNCTION_INIT;
1543 b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	6027 DWMLE *mle = handle;
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6028 NSTextStorage *ts = [mle textStorage];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6029 NSMutableString *ms = [ts mutableString];
1128 7d7535f6bc4e Added ability to set background color of MLE; setting foreground still outstanding. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1120 diff changeset	6030 const char *tmp = [ms UTF8String];
7d7535f6bc4e Added ability to set background color of MLE; setting foreground still outstanding. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1120 diff changeset	6031 strncpy(buffer, tmp+startpoint, length);
1129 ab73d0269a5b Ensure default keypress event is not processed if handler returns 1 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1128 diff changeset	6032 buffer[length] = '\0';
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6033 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6034 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6035
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6036 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6037 * Obtains information about an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6038 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6039 * handle: Handle to the MLE to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6040 * bytes: A pointer to a variable to return the total bytes.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6041 * lines: A pointer to a variable to return the number of lines.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6042 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6043 DW_FUNCTION_DEFINITION(dw_mle_get_size, void, HWND handle, unsigned long bytes, unsigned long lines)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6044 DW_FUNCTION_ADD_PARAM3(handle, bytes, lines)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6045 DW_FUNCTION_NO_RETURN(dw_mle_get_size)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6046 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, bytes, unsigned long , lines, unsigned long )
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6047 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6048 DW_FUNCTION_INIT;
1543 b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	6049 DWMLE *mle = handle;
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6050 NSTextStorage *ts = [mle textStorage];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6051 NSMutableString *ms = [ts mutableString];
807 f7016a38bedd Fix for dw_window_set_text() on buttons not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 806 diff changeset	6052 NSUInteger numberOfLines, index, stringLength = [ms length];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	6053
992 2d80b4dcff9a A few MLE fixes on the Mac... and a slightly updated dwtest for MLE testing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 989 diff changeset	6054 if(bytes)
2d80b4dcff9a A few MLE fixes on the Mac... and a slightly updated dwtest for MLE testing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 989 diff changeset	6055 *bytes = stringLength;
2d80b4dcff9a A few MLE fixes on the Mac... and a slightly updated dwtest for MLE testing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 989 diff changeset	6056 if(lines)
2d80b4dcff9a A few MLE fixes on the Mac... and a slightly updated dwtest for MLE testing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 989 diff changeset	6057 {
2d80b4dcff9a A few MLE fixes on the Mac... and a slightly updated dwtest for MLE testing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 989 diff changeset	6058 for(index=0, numberOfLines=0; index < stringLength; numberOfLines++)
2d80b4dcff9a A few MLE fixes on the Mac... and a slightly updated dwtest for MLE testing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 989 diff changeset	6059 index = NSMaxRange([ms lineRangeForRange:NSMakeRange(index, 0)]);
1041 6a57bf20d8f9 Return displayName property instead of fontName property in dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1040 diff changeset	6060
992 2d80b4dcff9a A few MLE fixes on the Mac... and a slightly updated dwtest for MLE testing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 989 diff changeset	6061 *lines = numberOfLines;
2d80b4dcff9a A few MLE fixes on the Mac... and a slightly updated dwtest for MLE testing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 989 diff changeset	6062 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6063 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6064 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6065
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6066 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6067 * Deletes text from an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6068 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6069 * handle: Handle to the MLE to be deleted from.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6070 * startpoint: Point to start deleting text.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6071 * length: Amount of text to be deleted.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6072 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6073 DW_FUNCTION_DEFINITION(dw_mle_delete, void, HWND handle, int startpoint, int length)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6074 DW_FUNCTION_ADD_PARAM3(handle, startpoint, length)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6075 DW_FUNCTION_NO_RETURN(dw_mle_delete)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6076 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, startpoint, int, length, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6077 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6078 DW_FUNCTION_INIT;
1543 b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	6079 DWMLE *mle = handle;
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6080 NSTextStorage *ts = [mle textStorage];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6081 NSMutableString *ms = [ts mutableString];
992 2d80b4dcff9a A few MLE fixes on the Mac... and a slightly updated dwtest for MLE testing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 989 diff changeset	6082 NSUInteger mslength = [ms length];
2d80b4dcff9a A few MLE fixes on the Mac... and a slightly updated dwtest for MLE testing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 989 diff changeset	6083 if(startpoint < 0)
2d80b4dcff9a A few MLE fixes on the Mac... and a slightly updated dwtest for MLE testing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 989 diff changeset	6084 startpoint = 0;
2d80b4dcff9a A few MLE fixes on the Mac... and a slightly updated dwtest for MLE testing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 989 diff changeset	6085 if(startpoint > mslength)
2d80b4dcff9a A few MLE fixes on the Mac... and a slightly updated dwtest for MLE testing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 989 diff changeset	6086 startpoint = (int)mslength;
2d80b4dcff9a A few MLE fixes on the Mac... and a slightly updated dwtest for MLE testing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 989 diff changeset	6087 if(startpoint + length > mslength)
2d80b4dcff9a A few MLE fixes on the Mac... and a slightly updated dwtest for MLE testing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 989 diff changeset	6088 length = (int)mslength - startpoint;
2d80b4dcff9a A few MLE fixes on the Mac... and a slightly updated dwtest for MLE testing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 989 diff changeset	6089 [ms deleteCharactersInRange:NSMakeRange(startpoint, length)];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6090 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6091 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6092
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6093 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6094 * Clears all text from an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6095 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6096 * handle: Handle to the MLE to be cleared.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6097 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6098 DW_FUNCTION_DEFINITION(dw_mle_clear, void, HWND handle)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6099 DW_FUNCTION_ADD_PARAM1(handle)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6100 DW_FUNCTION_NO_RETURN(dw_mle_clear)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6101 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6102 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6103 DW_FUNCTION_INIT;
1543 b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	6104 DWMLE *mle = handle;
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6105 NSTextStorage *ts = [mle textStorage];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6106 NSMutableString *ms = [ts mutableString];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6107 NSUInteger length = [ms length];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6108 [ms deleteCharactersInRange:NSMakeRange(0, length)];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6109 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6110 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6111
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6112 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6113 * Sets the visible line of an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6114 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6115 * handle: Handle to the MLE to be positioned.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6116 * line: Line to be visible.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6117 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6118 DW_FUNCTION_DEFINITION(dw_mle_set_visible, void, HWND handle, int line)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6119 DW_FUNCTION_ADD_PARAM2(handle, line)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6120 DW_FUNCTION_NO_RETURN(dw_mle_set_visible)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6121 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, line, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6122 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6123 DW_FUNCTION_INIT;
1543 b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	6124 DWMLE *mle = handle;
802 676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	6125 NSTextStorage *ts = [mle textStorage];
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	6126 NSMutableString *ms = [ts mutableString];
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	6127 NSUInteger numberOfLines, index, stringLength = [ms length];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	6128
802 676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	6129 for(index=0, numberOfLines=0; index < stringLength && numberOfLines < line; numberOfLines++)
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	6130 index = NSMaxRange([ms lineRangeForRange:NSMakeRange(index, 0)]);
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	6131
802 676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	6132 if(line == numberOfLines)
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	6133 {
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	6134 [mle scrollRangeToVisible:[ms lineRangeForRange:NSMakeRange(index, 0)]];
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	6135 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6136 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6137 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6138
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6139 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6140 * Sets the editablity of an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6141 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6142 * handle: Handle to the MLE.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6143 * state: TRUE if it can be edited, FALSE for readonly.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6144 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6145 void API dw_mle_set_editable(HWND handle, int state)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6146 {
1543 b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	6147 DWMLE *mle = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6148 if(state)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6149 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6150 [mle setEditable:YES];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6151 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6152 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6153 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6154 [mle setEditable:NO];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6155 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6156 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6157
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6158 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6159 * Sets the word wrap state of an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6160 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6161 * handle: Handle to the MLE.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6162 * state: TRUE if it wraps, FALSE if it doesn't.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6163 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6164 void API dw_mle_set_word_wrap(HWND handle, int state)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6165 {
1543 b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	6166 DWMLE *mle = handle;
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	6167 NSScrollView *sv = [mle scrollview];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	6168
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6169 if(state)
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6170 {
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	6171 [[mle textContainer] setWidthTracksTextView:YES];
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	6172 [sv setHasHorizontalScroller:NO];
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6173 }
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6174 else
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6175 {
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	6176 [[mle textContainer] setWidthTracksTextView:NO];
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	6177 [[mle textContainer] setContainerSize:[mle maxSize]];
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6178 [mle setHorizontallyResizable:YES];
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	6179 [sv setHasHorizontalScroller:YES];
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6180 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6181 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6182
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6183 /*
1924 c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	6184 * Sets the word auto complete state of an MLE box.
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	6185 * Parameters:
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	6186 * handle: Handle to the MLE.
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	6187 * state: Bitwise combination of DW_MLE_COMPLETE_TEXT/DASH/QUOTE
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	6188 */
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	6189 void API dw_mle_set_auto_complete(HWND handle, int state)
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	6190 {
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	6191 DWMLE *mle = handle;
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	6192 [mle setAutomaticQuoteSubstitutionEnabled:(state & DW_MLE_COMPLETE_QUOTE ? YES : NO)];
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	6193 [mle setAutomaticDashSubstitutionEnabled:(state & DW_MLE_COMPLETE_DASH ? YES : NO)];
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	6194 [mle setAutomaticTextReplacementEnabled:(state & DW_MLE_COMPLETE_TEXT ? YES : NO)];
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	6195 }
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	6196
c47a04d83b90 Added dw_mle_set_auto_complete() to enable MLE auto completion on supported platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1922 diff changeset	6197 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6198 * Sets the current cursor position of an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6199 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6200 * handle: Handle to the MLE to be positioned.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6201 * point: Point to position cursor.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6202 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6203 DW_FUNCTION_DEFINITION(dw_mle_set_cursor, void, HWND handle, int point)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6204 DW_FUNCTION_ADD_PARAM2(handle, point)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6205 DW_FUNCTION_NO_RETURN(dw_mle_set_cursor)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6206 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, point, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6207 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6208 DW_FUNCTION_INIT;
1543 b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	6209 DWMLE *mle = handle;
989 6de00477d627 Clamp the point specified in dw_mle_set_cursor() to the range of text to avoid an exception on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 986 diff changeset	6210 NSTextStorage *ts = [mle textStorage];
6de00477d627 Clamp the point specified in dw_mle_set_cursor() to the range of text to avoid an exception on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 986 diff changeset	6211 NSMutableString *ms = [ts mutableString];
6de00477d627 Clamp the point specified in dw_mle_set_cursor() to the range of text to avoid an exception on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 986 diff changeset	6212 NSUInteger length = [ms length];
6de00477d627 Clamp the point specified in dw_mle_set_cursor() to the range of text to avoid an exception on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 986 diff changeset	6213 if(point < 0)
6de00477d627 Clamp the point specified in dw_mle_set_cursor() to the range of text to avoid an exception on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 986 diff changeset	6214 point = 0;
6de00477d627 Clamp the point specified in dw_mle_set_cursor() to the range of text to avoid an exception on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 986 diff changeset	6215 if(point > length)
6de00477d627 Clamp the point specified in dw_mle_set_cursor() to the range of text to avoid an exception on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 986 diff changeset	6216 point = (int)length;
712 01107d8e033e Fixed the scrollbar maximum range to be correct. Also added some MLE code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 711 diff changeset	6217 [mle setSelectedRange: NSMakeRange(point,point)];
1201 196cd8a8e6a8 Fixed dw_mle_set_cursor() should scroll to the point on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1193 diff changeset	6218 [mle scrollRangeToVisible:NSMakeRange(point,point)];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6219 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6220 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6221
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6222 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6223 * Finds text in an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6224 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6225 * handle: Handle to the MLE to be cleared.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6226 * text: Text to search for.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6227 * point: Start point of search.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6228 * flags: Search specific flags.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6229 */
2037 a00e73284c97 Mac: Continuing const changes. Hopefully last Mac commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2035 diff changeset	6230 DW_FUNCTION_DEFINITION(dw_mle_search, int, HWND handle, const char *text, int point, unsigned long flags)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6231 DW_FUNCTION_ADD_PARAM4(handle, text, point, flags)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6232 DW_FUNCTION_RETURN(dw_mle_search, int)
2037 a00e73284c97 Mac: Continuing const changes. Hopefully last Mac commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2035 diff changeset	6233 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, text, const char *, point, int, flags, unsigned long)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6234 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6235 DW_FUNCTION_INIT;
1543 b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	6236 DWMLE *mle = handle;
888 cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	6237 NSTextStorage *ts = [mle textStorage];
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	6238 NSMutableString *ms = [ts mutableString];
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	6239 NSString *searchForMe = [NSString stringWithUTF8String:text];
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	6240 NSRange searchRange = NSMakeRange(point, [ms length] - point);
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	6241 NSRange range = NSMakeRange(NSNotFound, 0);
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	6242 NSUInteger options = flags ? flags : NSCaseInsensitiveSearch;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6243 int retval = -1;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	6244
888 cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	6245 if(ms)
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	6246 range = [ms rangeOfString:searchForMe options:options range:searchRange];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6247 if(range.location == NSNotFound)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6248 retval = (int)range.location;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6249 DW_FUNCTION_RETURN_THIS(retval);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6250 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6251
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6252 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6253 * Stops redrawing of an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6254 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6255 * handle: Handle to the MLE to freeze.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6256 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6257 void API dw_mle_freeze(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6258 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6259 /* Don't think this is necessary */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6260 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6261
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6262 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6263 * Resumes redrawing of an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6264 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6265 * handle: Handle to the MLE to thaw.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6266 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6267 void API dw_mle_thaw(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6268 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6269 /* Don't think this is necessary */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6270 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6271
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6272 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6273 * Create a new status text window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6274 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6275 * text: The text to be display by the static text widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6276 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6277 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	6278 HWND API dw_status_text_new(const char *text, ULONG cid)
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	6279 {
1772 5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	6280 NSBox *border = [[NSBox alloc] init];
751 eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	6281 NSTextField *textfield = dw_text_new(text, cid);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	6282
1772 5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	6283 [border setBorderType:NSGrooveBorder];
5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	6284 //[border setBorderType:NSLineBorder];
5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	6285 [border setTitlePosition:NSNoTitle];
5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	6286 [border setContentView:textfield];
1778 e71ab68198ce Minor cleanups for the Mac status text changes for 10.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1776 diff changeset	6287 [border setContentViewMargins:NSMakeSize(1.5,1.5)];
1772 5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	6288 [textfield autorelease];
751 eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	6289 [textfield setBackgroundColor:[NSColor clearColor]];
931 dfd84cefd80b Minor changes to vertical centering on (status) text fields on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 930 diff changeset	6290 [[textfield cell] setVCenter:YES];
1772 5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	6291 return border;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6292 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6293
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6294 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6295 * Create a new static text window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6296 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6297 * text: The text to be display by the static text widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6298 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6299 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	6300 HWND API dw_text_new(const char *text, ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6301 {
1564 d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	6302 DWText *textfield = [[DWText alloc] init];
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6303 [textfield setEditable:NO];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6304 [textfield setSelectable:NO];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6305 [textfield setBordered:NO];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6306 [textfield setDrawsBackground:NO];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6307 [textfield setStringValue:[ NSString stringWithUTF8String:text ]];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	6308 [textfield setTag:cid];
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6309 if(DWDefaultFont)
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6310 {
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6311 [[textfield cell] setFont:DWDefaultFont];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6312 }
1712 daa59fc8d6e5 Disable wrapping on entryfields and static text on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1709 diff changeset	6313 [[textfield cell] setWraps:NO];
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	6314 return textfield;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6315 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6316
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6317 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6318 * Creates a rendering context widget (window) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6319 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6320 * id: An id to be used with dw_window_from_id.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6321 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6322 * A handle to the widget or NULL on failure.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6323 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	6324 HWND API dw_render_new(unsigned long cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6325 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6326 DWRender *render = [[DWRender alloc] init];
922 07f9a73c6847 Fix for button press/release events coordinates being relative to the window instead of the screen on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 921 diff changeset	6327 [render setTag:cid];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6328 return render;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6329 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6330
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6331 /* Sets the current foreground drawing color.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6332 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6333 * red: red value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6334 * green: green value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6335 * blue: blue value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6336 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6337 void API dw_color_foreground_set(unsigned long value)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6338 {
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	6339 NSColor *oldcolor = pthread_getspecific(_dw_fg_color_key);
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	6340 NSColor *newcolor;
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	6341 DW_LOCAL_POOL_IN;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	6342
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6343 _foreground = _get_color(value);
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	6344
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	6345 newcolor = [[NSColor colorWithDeviceRed: DW_RED_VALUE(_foreground)/255.0 green:
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	6346 DW_GREEN_VALUE(_foreground)/255.0 blue:
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	6347 DW_BLUE_VALUE(_foreground)/255.0 alpha: 1] retain];
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	6348 pthread_setspecific(_dw_fg_color_key, newcolor);
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	6349 [oldcolor release];
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	6350 DW_LOCAL_POOL_OUT;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6351 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6352
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6353 /* Sets the current background drawing color.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6354 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6355 * red: red value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6356 * green: green value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6357 * blue: blue value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6358 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6359 void API dw_color_background_set(unsigned long value)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6360 {
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	6361 NSColor *oldcolor = pthread_getspecific(_dw_bg_color_key);
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	6362 NSColor *newcolor;
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	6363 DW_LOCAL_POOL_IN;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	6364
891 3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	6365 if(value == DW_CLR_DEFAULT)
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	6366 {
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	6367 pthread_setspecific(_dw_bg_color_key, NULL);
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	6368 }
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	6369 else
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	6370 {
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	6371 _background = _get_color(value);
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	6372
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	6373 newcolor = [[NSColor colorWithDeviceRed: DW_RED_VALUE(_background)/255.0 green:
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	6374 DW_GREEN_VALUE(_background)/255.0 blue:
891 3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	6375 DW_BLUE_VALUE(_background)/255.0 alpha: 1] retain];
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	6376 pthread_setspecific(_dw_bg_color_key, newcolor);
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	6377 }
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	6378 [oldcolor release];
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	6379 DW_LOCAL_POOL_OUT;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6380 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6381
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6382 /* Allows the user to choose a color using the system's color chooser dialog.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6383 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6384 * value: current color
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6385 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6386 * The selected color or the current color if cancelled.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6387 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6388 unsigned long API dw_color_choose(unsigned long value)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6389 {
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	6390 /* Create the Color Chooser Dialog class. */
1644 2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	6391 DWColorChoose *colorDlg;
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	6392 DWDialog *dialog;
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	6393 DW_LOCAL_POOL_IN;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6394
1644 2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	6395 if(![DWColorChoose sharedColorPanelExists])
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	6396 {
733 8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	6397 colorDlg = (DWColorChoose *)[DWColorChoose sharedColorPanel];
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	6398 /* Set defaults for the dialog. */
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6399 [colorDlg setContinuous:NO];
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6400 [colorDlg setTarget:colorDlg];
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6401 [colorDlg setAction:@selector(changeColor:)];
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6402 }
1644 2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	6403 else
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	6404 colorDlg = (DWColorChoose *)[DWColorChoose sharedColorPanel];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	6405
1644 2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	6406 /* If someone is already waiting just return */
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	6407 if([colorDlg dialog])
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	6408 {
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	6409 DW_LOCAL_POOL_OUT;
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	6410 return value;
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	6411 }
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	6412
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	6413 unsigned long tempcol = _get_color(value);
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	6414 NSColor *color = [[NSColor colorWithDeviceRed: DW_RED_VALUE(tempcol)/255.0 green: DW_GREEN_VALUE(tempcol)/255.0 blue: DW_BLUE_VALUE(tempcol)/255.0 alpha: 1] retain];
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	6415 [colorDlg setColor:color];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	6416
733 8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	6417 dialog = dw_dialog_new(colorDlg);
8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	6418 [colorDlg setDialog:dialog];
690 b93f5cdab37d Fixes to the color picker... it actually shows the picker now but it still needs more work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 689 diff changeset	6419 [colorDlg makeKeyAndOrderFront:nil];
733 8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	6420
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	6421 /* Wait for them to pick a color */
690 b93f5cdab37d Fixes to the color picker... it actually shows the picker now but it still needs more work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 689 diff changeset	6422 color = (NSColor *)dw_dialog_wait(dialog);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6423
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	6424 /* Figure out the value of what they returned */
734 668a88a0b930 Fixed a minor 64/32 bit issue and fixed my having blue and red values reversed in the color table. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 733 diff changeset	6425 CGFloat red, green, blue;
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	6426 [color getRed:&red green:&green blue:&blue alpha:NULL];
db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	6427 value = DW_RGB((int)(red * 255), (int)(green 255), (int)(blue 255));
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	6428 DW_LOCAL_POOL_OUT;
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	6429 return value;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6430 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6431
1938 5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	6432 /* Set the current context to be a flipped image,
5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	6433 * On 10.10 or higher use CoreGraphics otherwise Graphics Port
5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	6434 */
5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	6435 NSGraphicsContext _dw_draw_context(NSBitmapImageRep image)
5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	6436 {
5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	6437 #ifdef BUILDING_FOR_YOSEMITE
5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	6438 return [NSGraphicsContext graphicsContextWithCGContext:[[NSGraphicsContext graphicsContextWithBitmapImageRep:image] CGContext] flipped:YES];
5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	6439 #else
5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	6440 return [NSGraphicsContext graphicsContextWithGraphicsPort:[[NSGraphicsContext graphicsContextWithBitmapImageRep:image] graphicsPort] flipped:YES];
5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	6441 #endif
5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	6442 }
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	6443
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6444 /* Draw a point on a window (preferably a render window).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6445 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6446 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6447 * pixmap: Handle to the pixmap. (choose only one of these)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6448 * x: X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6449 * y: Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6450 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6451 DW_FUNCTION_DEFINITION(dw_draw_point, void, HWND handle, HPIXMAP pixmap, int x, int y)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6452 DW_FUNCTION_ADD_PARAM4(handle, pixmap, x, y)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6453 DW_FUNCTION_NO_RETURN(dw_draw_point)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6454 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, pixmap, HPIXMAP, x, int, y, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6455 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6456 DW_FUNCTION_INIT;
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	6457 DW_LOCAL_POOL_IN;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6458 id image = handle;
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6459 NSBitmapImageRep *bi = nil;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6460 bool bCanDraw = YES;
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	6461
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6462 if(pixmap)
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6463 bi = image = (id)pixmap->image;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6464 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6465 {
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6466 #ifdef BUILDING_FOR_MOJAVE
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6467 if([image isMemberOfClass:[DWRender class]])
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6468 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6469 DWRender *render = image;
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	6470
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6471 bi = [render cachedDrawingRep];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6472 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6473 #else
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6474 if((bCanDraw = [image lockFocusIfCanDraw]) == YES)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6475 _DWLastDrawable = handle;
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6476 #endif
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6477 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6478 if(bi)
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6479 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6480 [NSGraphicsContext saveGraphicsState];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6481 [NSGraphicsContext setCurrentContext:_dw_draw_context(bi)];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6482 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6483 if(bCanDraw == YES)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6484 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6485 NSBezierPath* aPath = [NSBezierPath bezierPath];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6486 [aPath setLineWidth: 0.5];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6487 NSColor *color = pthread_getspecific(_dw_fg_color_key);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6488 [color set];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6489
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6490 [aPath moveToPoint:NSMakePoint(x, y)];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6491 [aPath stroke];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6492 }
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6493 if(bi)
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	6494 [NSGraphicsContext restoreGraphicsState];
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6495 #ifndef BUILDING_FOR_MOJAVE
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6496 if(bCanDraw == YES && !pixmap)
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	6497 [image unlockFocus];
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6498 #endif
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	6499 DW_LOCAL_POOL_OUT;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6500 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6501 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6502
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6503 /* Draw a line on a window (preferably a render window).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6504 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6505 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6506 * pixmap: Handle to the pixmap. (choose only one of these)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6507 * x1: First X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6508 * y1: First Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6509 * x2: Second X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6510 * y2: Second Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6511 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6512 DW_FUNCTION_DEFINITION(dw_draw_line, void, HWND handle, HPIXMAP pixmap, int x1, int y1, int x2, int y2)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6513 DW_FUNCTION_ADD_PARAM6(handle, pixmap, x1, y1, x2, y2)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6514 DW_FUNCTION_NO_RETURN(dw_draw_line)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6515 DW_FUNCTION_RESTORE_PARAM6(handle, HWND, pixmap, HPIXMAP, x1, int, y1, int, x2, int, y2, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6516 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6517 DW_FUNCTION_INIT;
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	6518 DW_LOCAL_POOL_IN;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6519 id image = handle;
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6520 NSBitmapImageRep *bi = nil;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6521 bool bCanDraw = YES;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6522
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6523 if(pixmap)
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6524 bi = image = (id)pixmap->image;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6525 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6526 {
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6527 #ifdef BUILDING_FOR_MOJAVE
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6528 if([image isMemberOfClass:[DWRender class]])
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6529 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6530 DWRender *render = image;
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	6531
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6532 bi = [render cachedDrawingRep];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6533 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6534 #else
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6535 if((bCanDraw = [image lockFocusIfCanDraw]) == YES)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6536 _DWLastDrawable = handle;
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6537 #endif
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6538 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6539 if(bi)
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6540 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6541 [NSGraphicsContext saveGraphicsState];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6542 [NSGraphicsContext setCurrentContext:_dw_draw_context(bi)];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6543 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6544 if(bCanDraw == YES)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6545 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6546 NSBezierPath* aPath = [NSBezierPath bezierPath];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6547 NSColor *color = pthread_getspecific(_dw_fg_color_key);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6548 [color set];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6549
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6550 [aPath moveToPoint:NSMakePoint(x1 + 0.5, y1 + 0.5)];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6551 [aPath lineToPoint:NSMakePoint(x2 + 0.5, y2 + 0.5)];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6552 [aPath stroke];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6553 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6554
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6555 if(bi)
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	6556 [NSGraphicsContext restoreGraphicsState];
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6557 #ifndef BUILDING_FOR_MOJAVE
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6558 if(bCanDraw == YES && !pixmap)
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	6559 [image unlockFocus];
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6560 #endif
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	6561 DW_LOCAL_POOL_OUT;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6562 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6563 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6564
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6565 /* Draw text on a window (preferably a render window).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6566 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6567 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6568 * pixmap: Handle to the pixmap. (choose only one of these)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6569 * x: X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6570 * y: Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6571 * text: Text to be displayed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6572 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	6573 DW_FUNCTION_DEFINITION(dw_draw_text, void, HWND handle, HPIXMAP pixmap, int x, int y, const char *text)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6574 DW_FUNCTION_ADD_PARAM5(handle, pixmap, x, y, text)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6575 DW_FUNCTION_NO_RETURN(dw_draw_text)
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	6576 DW_FUNCTION_RESTORE_PARAM5(handle, HWND, pixmap, HPIXMAP, x, int, y, int, text, const char *)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6577 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6578 DW_FUNCTION_INIT;
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	6579 DW_LOCAL_POOL_IN;
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6580 id image = handle;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6581 NSString *nstr = [ NSString stringWithUTF8String:text ];
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6582 NSBitmapImageRep *bi = nil;
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6583 NSFont *font = nil;
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6584 DWRender *render;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6585 bool bCanDraw = YES;
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	6586
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6587 if(pixmap)
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6588 {
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6589 bi = image = (id)pixmap->image;
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6590 font = pixmap->font;
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6591 render = pixmap->handle;
1146 9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	6592 if(!font && [render isMemberOfClass:[DWRender class]])
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6593 {
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6594 font = [render font];
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6595 }
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6596 image = (id)pixmap->image;
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6597 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6598 else if(image && [image isMemberOfClass:[DWRender class]])
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6599 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6600 render = image;
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6601 font = [render font];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6602 #ifdef BUILDING_FOR_MOJAVE
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6603 bi = [render cachedDrawingRep];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6604 #else
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6605 if((bCanDraw = [image lockFocusIfCanDraw]) == YES)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6606 _DWLastDrawable = handle;
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6607 #endif
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6608 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6609 if(bi)
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6610 {
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	6611 [NSGraphicsContext saveGraphicsState];
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6612 [NSGraphicsContext setCurrentContext:_dw_draw_context(bi)];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6613 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6614
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6615 if(bCanDraw == YES)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6616 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6617 NSColor *fgcolor = pthread_getspecific(_dw_fg_color_key);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6618 NSColor *bgcolor = pthread_getspecific(_dw_bg_color_key);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6619 NSMutableDictionary *dict = [[NSMutableDictionary alloc] initWithObjectsAndKeys:fgcolor, NSForegroundColorAttributeName, nil];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6620 if(bgcolor)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6621 [dict setValue:bgcolor forKey:NSBackgroundColorAttributeName];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6622 if(font)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6623 [dict setValue:font forKey:NSFontAttributeName];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6624 [nstr drawAtPoint:NSMakePoint(x, y) withAttributes:dict];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6625 [dict release];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6626 }
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6627
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6628 if(bi)
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	6629 [NSGraphicsContext restoreGraphicsState];
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6630 #ifndef BUILDING_FOR_MOJAVE
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6631 if(bCanDraw == YES && !pixmap)
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6632 [image unlockFocus];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6633 #endif
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	6634 DW_LOCAL_POOL_OUT;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6635 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6636 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6637
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6638 /* Query the width and height of a text string.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6639 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6640 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6641 * pixmap: Handle to the pixmap. (choose only one of these)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6642 * text: Text to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6643 * width: Pointer to a variable to be filled in with the width.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6644 * height Pointer to a variable to be filled in with the height.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6645 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	6646 void API dw_font_text_extents_get(HWND handle, HPIXMAP pixmap, const char text, int width, int *height)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6647 {
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6648 id object = handle;
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	6649 NSString *nstr;
1230 75a773cdb626 Fixes to dw_font_text_extents_get() on Mac so it honors the font set with dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1225 diff changeset	6650 NSFont *font = nil;
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	6651 DW_LOCAL_POOL_IN;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	6652
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	6653 nstr = [NSString stringWithUTF8String:text];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	6654
1230 75a773cdb626 Fixes to dw_font_text_extents_get() on Mac so it honors the font set with dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1225 diff changeset	6655 /* Check the pixmap for associated object or font */
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6656 if(pixmap)
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6657 {
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6658 object = pixmap->handle;
1230 75a773cdb626 Fixes to dw_font_text_extents_get() on Mac so it honors the font set with dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1225 diff changeset	6659 font = pixmap->font;
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6660 }
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6661 NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
1230 75a773cdb626 Fixes to dw_font_text_extents_get() on Mac so it honors the font set with dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1225 diff changeset	6662 /* If we didn't get a font from the pixmap... try the associated object */
75a773cdb626 Fixes to dw_font_text_extents_get() on Mac so it honors the font set with dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1225 diff changeset	6663 if(!font && ([object isMemberOfClass:[DWRender class]] \|\| [object isKindOfClass:[NSControl class]]))
75a773cdb626 Fixes to dw_font_text_extents_get() on Mac so it honors the font set with dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1225 diff changeset	6664 {
75a773cdb626 Fixes to dw_font_text_extents_get() on Mac so it honors the font set with dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1225 diff changeset	6665 font = [object font];
75a773cdb626 Fixes to dw_font_text_extents_get() on Mac so it honors the font set with dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1225 diff changeset	6666 }
75a773cdb626 Fixes to dw_font_text_extents_get() on Mac so it honors the font set with dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1225 diff changeset	6667 /* If we got a font... add it to the dictionary */
75a773cdb626 Fixes to dw_font_text_extents_get() on Mac so it honors the font set with dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1225 diff changeset	6668 if(font)
75a773cdb626 Fixes to dw_font_text_extents_get() on Mac so it honors the font set with dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1225 diff changeset	6669 {
75a773cdb626 Fixes to dw_font_text_extents_get() on Mac so it honors the font set with dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1225 diff changeset	6670 [dict setValue:font forKey:NSFontAttributeName];
75a773cdb626 Fixes to dw_font_text_extents_get() on Mac so it honors the font set with dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1225 diff changeset	6671 }
75a773cdb626 Fixes to dw_font_text_extents_get() on Mac so it honors the font set with dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1225 diff changeset	6672 /* Calculate the size of the string */
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6673 NSSize size = [nstr sizeWithAttributes:dict];
665 e6bec2290f3f Fixing warnings with Xcode 4 and switched to manual releasing in the draw functions to stop leaking. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 664 diff changeset	6674 [dict release];
1230 75a773cdb626 Fixes to dw_font_text_extents_get() on Mac so it honors the font set with dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1225 diff changeset	6675 /* Return whatever information we can */
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6676 if(width)
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6677 {
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6678 *width = size.width;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6679 }
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6680 if(height)
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6681 {
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6682 *height = size.height;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	6683 }
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	6684 DW_LOCAL_POOL_OUT;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6685 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6686
1523 026c0b4d6ee9 Initial implmentation of DW_DRAW_NOAA on Mac... only works on pixmaps right now. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1522 diff changeset	6687 /* Internal function to create an image graphics context...
026c0b4d6ee9 Initial implmentation of DW_DRAW_NOAA on Mac... only works on pixmaps right now. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1522 diff changeset	6688 * with or without antialiasing enabled.
026c0b4d6ee9 Initial implmentation of DW_DRAW_NOAA on Mac... only works on pixmaps right now. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1522 diff changeset	6689 */
026c0b4d6ee9 Initial implmentation of DW_DRAW_NOAA on Mac... only works on pixmaps right now. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1522 diff changeset	6690 id _create_gc(id image, bool antialiased)
026c0b4d6ee9 Initial implmentation of DW_DRAW_NOAA on Mac... only works on pixmaps right now. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1522 diff changeset	6691 {
1938 5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	6692 #ifdef BUILDING_FOR_YOSEMITE
5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	6693 CGContextRef context = (CGContextRef)[[NSGraphicsContext graphicsContextWithBitmapImageRep:image] CGContext];
5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	6694 NSGraphicsContext *gc = [NSGraphicsContext graphicsContextWithCGContext:context flipped:YES];
5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	6695 #else
1523 026c0b4d6ee9 Initial implmentation of DW_DRAW_NOAA on Mac... only works on pixmaps right now. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1522 diff changeset	6696 CGContextRef context = (CGContextRef)[[NSGraphicsContext graphicsContextWithBitmapImageRep:image] graphicsPort];
026c0b4d6ee9 Initial implmentation of DW_DRAW_NOAA on Mac... only works on pixmaps right now. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1522 diff changeset	6697 NSGraphicsContext *gc = [NSGraphicsContext graphicsContextWithGraphicsPort:context flipped:YES];
1938 5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	6698 #endif
1523 026c0b4d6ee9 Initial implmentation of DW_DRAW_NOAA on Mac... only works on pixmaps right now. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1522 diff changeset	6699 [gc setShouldAntialias:antialiased];
026c0b4d6ee9 Initial implmentation of DW_DRAW_NOAA on Mac... only works on pixmaps right now. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1522 diff changeset	6700 CGContextSetAllowsAntialiasing(context, antialiased);
026c0b4d6ee9 Initial implmentation of DW_DRAW_NOAA on Mac... only works on pixmaps right now. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1522 diff changeset	6701 return gc;
026c0b4d6ee9 Initial implmentation of DW_DRAW_NOAA on Mac... only works on pixmaps right now. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1522 diff changeset	6702 }
026c0b4d6ee9 Initial implmentation of DW_DRAW_NOAA on Mac... only works on pixmaps right now. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1522 diff changeset	6703
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6704 /* Draw a polygon on a window (preferably a render window).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6705 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6706 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6707 * pixmap: Handle to the pixmap. (choose only one of these)
1275 0b34e2cf0706 Updated dw_draw_rect and dw_draw_polygon to accept flags the same way as dw_draw_arc. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1269 diff changeset	6708 * flags: DW_DRAW_FILL (1) to fill the polygon or DW_DRAW_DEFAULT (0).
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6709 * x: X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6710 * y: Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6711 * width: Width of rectangle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6712 * height: Height of rectangle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6713 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6714 DW_FUNCTION_DEFINITION(dw_draw_polygon, void, HWND handle, HPIXMAP pixmap, int flags, int npoints, int x, int y)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6715 DW_FUNCTION_ADD_PARAM6(handle, pixmap, flags, npoints, x, y)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6716 DW_FUNCTION_NO_RETURN(dw_draw_polygon)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6717 DW_FUNCTION_RESTORE_PARAM6(handle, HWND, pixmap, HPIXMAP, flags, int, npoints, int, x, int , y, int )
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6718 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6719 DW_FUNCTION_INIT;
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	6720 DW_LOCAL_POOL_IN;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6721 id image = handle;
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6722 NSBitmapImageRep *bi = nil;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6723 bool bCanDraw = YES;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6724 int z;
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	6725
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6726 if(pixmap)
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6727 bi = image = (id)pixmap->image;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6728 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6729 {
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6730 #ifdef BUILDING_FOR_MOJAVE
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6731 if([image isMemberOfClass:[DWRender class]])
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6732 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6733 DWRender *render = image;
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	6734
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6735 bi = [render cachedDrawingRep];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6736 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6737 #else
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6738 if((bCanDraw = [image lockFocusIfCanDraw]) == YES)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6739 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6740 _DWLastDrawable = handle;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6741 [[NSGraphicsContext currentContext] setShouldAntialias:(flags & DW_DRAW_NOAA ? NO : YES)];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6742 }
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6743 #endif
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6744 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6745 if(bi)
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6746 {
1950 bb4eaf02cdaf Mac: Pass bi to _create_gc() instead of image. Needs to be NSBitmapImageRep. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1949 diff changeset	6747 id gc = _create_gc(bi, flags & DW_DRAW_NOAA ? NO : YES);
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6748 [NSGraphicsContext saveGraphicsState];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6749 [NSGraphicsContext setCurrentContext:gc];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6750 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6751
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6752 if(bCanDraw == YES)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6753 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6754 NSBezierPath* aPath = [NSBezierPath bezierPath];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6755 NSColor *color = pthread_getspecific(_dw_fg_color_key);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6756 [color set];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6757
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6758 [aPath moveToPoint:NSMakePoint(x + 0.5, y + 0.5)];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6759 for(z=1;z<npoints;z++)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6760 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6761 [aPath lineToPoint:NSMakePoint(x[z] + 0.5, y[z] + 0.5)];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6762 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6763 [aPath closePath];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6764 if(flags & DW_DRAW_FILL)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6765 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6766 [aPath fill];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6767 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6768 [aPath stroke];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6769 }
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	6770
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6771 if(bi)
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	6772 [NSGraphicsContext restoreGraphicsState];
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6773 #ifndef BUILDING_FOR_MOJAVE
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6774 if(bCanDraw == YES && !pixmap)
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	6775 [image unlockFocus];
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6776 #endif
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	6777 DW_LOCAL_POOL_OUT;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6778 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6779 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6780
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6781 /* Draw a rectangle on a window (preferably a render window).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6782 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6783 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6784 * pixmap: Handle to the pixmap. (choose only one of these)
1275 0b34e2cf0706 Updated dw_draw_rect and dw_draw_polygon to accept flags the same way as dw_draw_arc. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1269 diff changeset	6785 * flags: DW_DRAW_FILL (1) to fill the box or DW_DRAW_DEFAULT (0).
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6786 * x: X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6787 * y: Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6788 * width: Width of rectangle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6789 * height: Height of rectangle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6790 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6791 DW_FUNCTION_DEFINITION(dw_draw_rect, void, HWND handle, HPIXMAP pixmap, int flags, int x, int y, int width, int height)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6792 DW_FUNCTION_ADD_PARAM7(handle, pixmap, flags, x, y, width, height)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6793 DW_FUNCTION_NO_RETURN(dw_draw_rect)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6794 DW_FUNCTION_RESTORE_PARAM7(handle, HWND, pixmap, HPIXMAP, flags, int, x, int, y, int, width, int, height, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6795 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6796 DW_FUNCTION_INIT;
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	6797 DW_LOCAL_POOL_IN;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6798 id image = handle;
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6799 NSBitmapImageRep *bi = nil;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6800 bool bCanDraw = YES;
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	6801
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6802 if(pixmap)
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6803 bi = image = (id)pixmap->image;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6804 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6805 {
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6806 #ifdef BUILDING_FOR_MOJAVE
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6807 if([image isMemberOfClass:[DWRender class]])
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6808 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6809 DWRender *render = image;
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	6810
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6811 bi = [render cachedDrawingRep];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6812 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6813 #else
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6814 if((bCanDraw = [image lockFocusIfCanDraw]) == YES)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6815 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6816 _DWLastDrawable = handle;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6817 [[NSGraphicsContext currentContext] setShouldAntialias:(flags & DW_DRAW_NOAA ? NO : YES)];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6818 }
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6819 #endif
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6820 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6821 if(bi)
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6822 {
1950 bb4eaf02cdaf Mac: Pass bi to _create_gc() instead of image. Needs to be NSBitmapImageRep. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1949 diff changeset	6823 id gc = _create_gc(bi, flags & DW_DRAW_NOAA ? NO : YES);
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6824 [NSGraphicsContext saveGraphicsState];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6825 [NSGraphicsContext setCurrentContext:gc];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6826 }
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	6827
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6828 if(bCanDraw == YES)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6829 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6830 NSColor *color = pthread_getspecific(_dw_fg_color_key);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6831 [color set];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6832
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6833 if(flags & DW_DRAW_FILL)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6834 [NSBezierPath fillRect:NSMakeRect(x, y, width, height)];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6835 else
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6836 [NSBezierPath strokeRect:NSMakeRect(x, y, width, height)];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6837 }
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	6838
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6839 if(bi)
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	6840 [NSGraphicsContext restoreGraphicsState];
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6841 #ifndef BUILDING_FOR_MOJAVE
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6842 if(bCanDraw == YES && !pixmap)
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	6843 [image unlockFocus];
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6844 #endif
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	6845 DW_LOCAL_POOL_OUT;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6846 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6847 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6848
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	6849 /* Draw an arc on a window (preferably a render window).
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	6850 * Parameters:
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	6851 * handle: Handle to the window.
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	6852 * pixmap: Handle to the pixmap. (choose only one of these)
1275 0b34e2cf0706 Updated dw_draw_rect and dw_draw_polygon to accept flags the same way as dw_draw_arc. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1269 diff changeset	6853 * flags: DW_DRAW_FILL (1) to fill the arc or DW_DRAW_DEFAULT (0).
0b34e2cf0706 Updated dw_draw_rect and dw_draw_polygon to accept flags the same way as dw_draw_arc. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1269 diff changeset	6854 * DW_DRAW_FULL will draw a complete circle/elipse.
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	6855 * xorigin: X coordinate of center of arc.
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	6856 * yorigin: Y coordinate of center of arc.
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	6857 * x1: X coordinate of first segment of arc.
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	6858 * y1: Y coordinate of first segment of arc.
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	6859 * x2: X coordinate of second segment of arc.
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	6860 * y2: Y coordinate of second segment of arc.
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	6861 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6862 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)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6863 DW_FUNCTION_ADD_PARAM9(handle, pixmap, flags, xorigin, yorigin, x1, y1, x2, y2)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6864 DW_FUNCTION_NO_RETURN(dw_draw_arc)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6865 DW_FUNCTION_RESTORE_PARAM9(handle, HWND, pixmap, HPIXMAP, flags, int, xorigin, int, yorigin, int, x1, int, y1, int, x2, int, y2, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6866 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6867 DW_FUNCTION_INIT;
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	6868 DW_LOCAL_POOL_IN;
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	6869 id image = handle;
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6870 NSBitmapImageRep *bi = nil;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6871 bool bCanDraw = YES;
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	6872
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	6873 if(pixmap)
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6874 bi = image = (id)pixmap->image;
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	6875 else
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	6876 {
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6877 #ifdef BUILDING_FOR_MOJAVE
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6878 if([image isMemberOfClass:[DWRender class]])
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6879 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6880 DWRender *render = image;
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	6881
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6882 bi = [render cachedDrawingRep];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6883 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6884 #else
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6885 if((bCanDraw = [image lockFocusIfCanDraw]) == YES)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6886 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6887 _DWLastDrawable = handle;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6888 [[NSGraphicsContext currentContext] setShouldAntialias:(flags & DW_DRAW_NOAA ? NO : YES)];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6889 }
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6890 #endif
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6891 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6892 if(bi)
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6893 {
1950 bb4eaf02cdaf Mac: Pass bi to _create_gc() instead of image. Needs to be NSBitmapImageRep. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1949 diff changeset	6894 id gc = _create_gc(bi, flags & DW_DRAW_NOAA ? NO : YES);
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6895 [NSGraphicsContext saveGraphicsState];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6896 [NSGraphicsContext setCurrentContext:gc];
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6897 }
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	6898
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6899 if(bCanDraw)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6900 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6901 NSBezierPath* aPath = [NSBezierPath bezierPath];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6902 NSColor *color = pthread_getspecific(_dw_fg_color_key);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6903 [color set];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6904
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6905 /* Special case of a full circle/oval */
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6906 if(flags & DW_DRAW_FULL)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6907 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6908 [aPath appendBezierPathWithOvalInRect:NSMakeRect(x1, y1, x2 - x1, y2 - y1)];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6909 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6910 else
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6911 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6912 double a1 = atan2((y1-yorigin), (x1-xorigin));
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6913 double a2 = atan2((y2-yorigin), (x2-xorigin));
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6914 double dx = xorigin - x1;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6915 double dy = yorigin - y1;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6916 double r = sqrt(dxdx + dydy);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6917
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6918 /* Convert to degrees */
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6919 a1 *= (180.0 / M_PI);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6920 a2 *= (180.0 / M_PI);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6921
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6922 /* Prepare to draw */
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6923 [aPath appendBezierPathWithArcWithCenter:NSMakePoint(xorigin, yorigin)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6924 radius:r startAngle:a1 endAngle:a2];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6925 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6926 /* If the fill flag is passed */
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6927 if(flags & DW_DRAW_FILL)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6928 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6929 [aPath fill];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6930 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6931 /* Actually do the drawing */
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6932 [aPath stroke];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6933 }
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	6934
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6935 if(bi)
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	6936 [NSGraphicsContext restoreGraphicsState];
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6937 #ifndef BUILDING_FOR_MOJAVE
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6938 if(bCanDraw == YES && !pixmap)
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	6939 [image unlockFocus];
1946 42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6940 #endif
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	6941 DW_LOCAL_POOL_OUT;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6942 DW_FUNCTION_RETURN_NOTHING;
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	6943 }
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	6944
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6945 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6946 * Create a tree object to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6947 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6948 * id: An ID to be used for getting the resource from the
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6949 * resource file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6950 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6951 DW_FUNCTION_DEFINITION(dw_tree_new, HWND, ULONG cid)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6952 DW_FUNCTION_ADD_PARAM1(cid)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6953 DW_FUNCTION_RETURN(dw_tree_new, HWND)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6954 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6955 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6956 DW_FUNCTION_INIT;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6957 NSScrollView *scrollview = [[NSScrollView alloc] init];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6958 DWTree *tree = [[DWTree alloc] init];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6959
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	6960 [tree setScrollview:scrollview];
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	6961 [scrollview setBorderType:NSBezelBorder];
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	6962 [scrollview setHasVerticalScroller:YES];
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	6963 [scrollview setAutohidesScrollers:YES];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6964
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	6965 [tree setAllowsMultipleSelection:NO];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6966 [tree setDataSource:tree];
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	6967 [tree setDelegate:tree];
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	6968 [scrollview setDocumentView:tree];
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	6969 [tree setHeaderView:nil];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	6970 [tree setTag:cid];
1313 9f12bc79924b Autorelease fixes for Mac allowing the objects to dealloc when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1312 diff changeset	6971 [tree autorelease];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6972 DW_FUNCTION_RETURN_THIS(tree);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6973 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6974
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6975 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6976 * Inserts an item into a tree window (widget) after another item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6977 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6978 * handle: Handle to the tree to be inserted.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6979 * item: Handle to the item to be positioned after.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6980 * title: The text title of the entry.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6981 * icon: Handle to coresponding icon.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6982 * parent: Parent handle or 0 if root.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6983 * itemdata: Item specific data.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6984 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	6985 DW_FUNCTION_DEFINITION(dw_tree_insert_after, HTREEITEM, HWND handle, HTREEITEM item, const char title, HICN icon, HTREEITEM parent, void itemdata)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6986 DW_FUNCTION_ADD_PARAM6(handle, item, title, icon, parent, itemdata)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6987 DW_FUNCTION_RETURN(dw_tree_insert_after, HTREEITEM)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6988 DW_FUNCTION_RESTORE_PARAM6(handle, HWND, item, HTREEITEM, title, char , icon, HICN, parent, HTREEITEM, itemdata, void )
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6989 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6990 DW_FUNCTION_INIT;
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	6991 DWTree *tree = handle;
935 114729f5aedc Needed to retain NSStrings in the tree view on Mac to prevent crashes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 934 diff changeset	6992 NSString *nstr = [[NSString stringWithUTF8String:title] retain];
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	6993 NSMutableArray *treenode = [[[NSMutableArray alloc] init] retain];
1067 6ca1132a240e Allow tree nodes without icons using the new NSMutableArray tree code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1065 diff changeset	6994 if(icon)
6ca1132a240e Allow tree nodes without icons using the new NSMutableArray tree code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1065 diff changeset	6995 [treenode addObject:icon];
6ca1132a240e Allow tree nodes without icons using the new NSMutableArray tree code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1065 diff changeset	6996 else
6ca1132a240e Allow tree nodes without icons using the new NSMutableArray tree code on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1065 diff changeset	6997 [treenode addObject:[NSNull null]];
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	6998 [treenode addObject:nstr];
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	6999 [treenode addObject:[NSValue valueWithPointer:itemdata]];
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	7000 [treenode addObject:[NSNull null]];
1064 b673b25bbd77 Fixed dw_tree_insert_after() so it works on Mac it previously functioned identical to dw_tree_insert(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1063 diff changeset	7001 [tree addTree:treenode and:parent after:item];
1063 2ebaea72ac95 Fix for some release calls causing issues on MacOS 10.7 Lion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1061 diff changeset	7002 if(parent)
2ebaea72ac95 Fix for some release calls causing issues on MacOS 10.7 Lion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1061 diff changeset	7003 [tree reloadItem:parent reloadChildren:YES];
2ebaea72ac95 Fix for some release calls causing issues on MacOS 10.7 Lion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1061 diff changeset	7004 else
2ebaea72ac95 Fix for some release calls causing issues on MacOS 10.7 Lion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1061 diff changeset	7005 [tree reloadData];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7006 DW_FUNCTION_RETURN_THIS(treenode);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7007 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7008
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7009 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7010 * Inserts an item into a tree window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7011 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7012 * handle: Handle to the tree to be inserted.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7013 * title: The text title of the entry.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7014 * icon: Handle to coresponding icon.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7015 * parent: Parent handle or 0 if root.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7016 * itemdata: Item specific data.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7017 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	7018 HTREEITEM API dw_tree_insert(HWND handle, const char title, HICN icon, HTREEITEM parent, void itemdata)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7019 {
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	7020 return dw_tree_insert_after(handle, NULL, title, icon, parent, itemdata);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7021 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7022
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7023 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7024 * Gets the text an item in a tree window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7025 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7026 * handle: Handle to the tree containing the item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7027 * item: Handle of the item to be modified.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7028 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7029 DW_FUNCTION_DEFINITION(dw_tree_get_title, char *, HWND handle, HTREEITEM item)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7030 DW_FUNCTION_ADD_PARAM2(handle, item)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7031 DW_FUNCTION_RETURN(dw_tree_get_title, char *)
1956 2924bc788170 Mac: Added code to avoid unused variable/parameter warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1955 diff changeset	7032 DW_FUNCTION_RESTORE_PARAM2(__DW_UNUSED__ handle, HWND, item, HTREEITEM)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7033 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7034 DW_FUNCTION_INIT;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7035 char *retval = NULL;
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	7036 NSMutableArray array = (NSMutableArray )item;
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	7037 NSString nstr = (NSString )[array objectAtIndex:1];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7038 retval = strdup([nstr UTF8String]);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7039 DW_FUNCTION_RETURN_THIS(retval);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7040 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7041
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7042 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7043 * Gets the text an item in a tree window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7044 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7045 * handle: Handle to the tree containing the item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7046 * item: Handle of the item to be modified.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7047 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7048 DW_FUNCTION_DEFINITION(dw_tree_get_parent, HTREEITEM, HWND handle, HTREEITEM item)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7049 DW_FUNCTION_ADD_PARAM2(handle, item)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7050 DW_FUNCTION_RETURN(dw_tree_get_parent, HTREEITEM)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7051 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, item, HTREEITEM)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7052 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7053 DW_FUNCTION_INIT;
881 7b2750744552 Implemented dw_tree_get_parent() for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 873 diff changeset	7054 HTREEITEM parent;
1064 b673b25bbd77 Fixed dw_tree_insert_after() so it works on Mac it previously functioned identical to dw_tree_insert(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1063 diff changeset	7055 DWTree *tree = handle;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	7056
1064 b673b25bbd77 Fixed dw_tree_insert_after() so it works on Mac it previously functioned identical to dw_tree_insert(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1063 diff changeset	7057 parent = [tree parentForItem:item];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7058 DW_FUNCTION_RETURN_THIS(parent);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7059 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7060
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7061 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7062 * Sets the text and icon of an item in a tree window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7063 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7064 * handle: Handle to the tree containing the item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7065 * item: Handle of the item to be modified.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7066 * title: The text title of the entry.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7067 * icon: Handle to coresponding icon.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7068 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	7069 DW_FUNCTION_DEFINITION(dw_tree_item_change, void, HWND handle, HTREEITEM item, const char *title, HICN icon)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7070 DW_FUNCTION_ADD_PARAM4(handle, item, title, icon)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7071 DW_FUNCTION_NO_RETURN(dw_tree_item_change)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7072 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, item, HTREEITEM, title, char *, icon, HICN)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7073 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7074 DW_FUNCTION_INIT;
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	7075 DWTree *tree = handle;
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	7076 NSMutableArray array = (NSMutableArray )item;
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	7077 DW_LOCAL_POOL_IN;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	7078
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	7079 if(title)
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	7080 {
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	7081 NSString *oldstr = [array objectAtIndex:1];
935 114729f5aedc Needed to retain NSStrings in the tree view on Mac to prevent crashes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 934 diff changeset	7082 NSString *nstr = [[NSString stringWithUTF8String:title] retain];
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	7083 [array replaceObjectAtIndex:1 withObject:nstr];
935 114729f5aedc Needed to retain NSStrings in the tree view on Mac to prevent crashes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 934 diff changeset	7084 [oldstr release];
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	7085 }
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	7086 if(icon)
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	7087 {
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	7088 [array replaceObjectAtIndex:0 withObject:icon];
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	7089 }
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	7090 [tree reloadData];
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	7091 DW_LOCAL_POOL_OUT;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7092 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7093 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7094
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7095 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7096 * Sets the item data of a tree item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7097 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7098 * handle: Handle to the tree containing the item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7099 * item: Handle of the item to be modified.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7100 * itemdata: User defined data to be associated with item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7101 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7102 DW_FUNCTION_DEFINITION(dw_tree_item_set_data, void, HWND handle, HTREEITEM item, void *itemdata)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7103 DW_FUNCTION_ADD_PARAM3(handle, item, itemdata)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7104 DW_FUNCTION_NO_RETURN(dw_tree_item_set_data)
1956 2924bc788170 Mac: Added code to avoid unused variable/parameter warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1955 diff changeset	7105 DW_FUNCTION_RESTORE_PARAM3(__DW_UNUSED__ handle, HWND, item, HTREEITEM, itemdata, void *)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7106 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7107 DW_FUNCTION_INIT;
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	7108 NSMutableArray array = (NSMutableArray )item;
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	7109 [array replaceObjectAtIndex:2 withObject:[NSValue valueWithPointer:itemdata]];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7110 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7111 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7112
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7113 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7114 * Gets the item data of a tree item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7115 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7116 * handle: Handle to the tree containing the item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7117 * item: Handle of the item to be modified.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7118 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7119 DW_FUNCTION_DEFINITION(dw_tree_item_get_data, void *, HWND handle, HTREEITEM item)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7120 DW_FUNCTION_ADD_PARAM2(handle, item)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7121 DW_FUNCTION_RETURN(dw_tree_item_get_data, void *)
1956 2924bc788170 Mac: Added code to avoid unused variable/parameter warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1955 diff changeset	7122 DW_FUNCTION_RESTORE_PARAM2(__DW_UNUSED__ handle, HWND, item, HTREEITEM)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7123 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7124 DW_FUNCTION_INIT;
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	7125 void *result = NULL;
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	7126 NSMutableArray array = (NSMutableArray )item;
25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	7127 NSValue *value = [array objectAtIndex:2];
1068 efaa9ceeb253 Removed test for class member for itemdata in dw_tree_item_get_data() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1067 diff changeset	7128 if(value)
1065 25e0317335fc Switched from using NSPointerArray to NSMutableArray on Mac to avoid the duplicate string crashes bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1064 diff changeset	7129 result = [value pointerValue];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7130 DW_FUNCTION_RETURN_THIS(result);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7131 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7132
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7133 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7134 * Sets this item as the active selection.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7135 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7136 * handle: Handle to the tree window (widget) to be selected.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7137 * item: Handle to the item to be selected.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7138 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7139 DW_FUNCTION_DEFINITION(dw_tree_item_select, void, HWND handle, HTREEITEM item)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7140 DW_FUNCTION_ADD_PARAM2(handle, item)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7141 DW_FUNCTION_NO_RETURN(dw_tree_item_select)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7142 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, item, HTREEITEM)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7143 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7144 DW_FUNCTION_INIT;
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	7145 DWTree *tree = handle;
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	7146 NSInteger itemIndex = [tree rowForItem:item];
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	7147 if(itemIndex > -1)
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	7148 {
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	7149 [tree selectRowIndexes:[NSIndexSet indexSetWithIndex:itemIndex] byExtendingSelection:NO];
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	7150 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7151 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7152 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7153
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7154 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7155 * Removes all nodes from a tree.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7156 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7157 * handle: Handle to the window (widget) to be cleared.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7158 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7159 DW_FUNCTION_DEFINITION(dw_tree_clear, void, HWND handle)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7160 DW_FUNCTION_ADD_PARAM1(handle)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7161 DW_FUNCTION_NO_RETURN(dw_tree_clear)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7162 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7163 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7164 DW_FUNCTION_INIT;
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	7165 DWTree *tree = handle;
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	7166 [tree clear];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7167 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7168 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7169
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7170 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7171 * Expands a node on a tree.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7172 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7173 * handle: Handle to the tree window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7174 * item: Handle to node to be expanded.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7175 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7176 DW_FUNCTION_DEFINITION(dw_tree_item_expand, void, HWND handle, HTREEITEM item)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7177 DW_FUNCTION_ADD_PARAM2(handle, item)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7178 DW_FUNCTION_NO_RETURN(dw_tree_item_expand)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7179 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, item, HTREEITEM)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7180 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7181 DW_FUNCTION_INIT;
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	7182 DWTree *tree = handle;
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	7183 [tree expandItem:item];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7184 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7185 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7186
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7187 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7188 * Collapses a node on a tree.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7189 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7190 * handle: Handle to the tree window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7191 * item: Handle to node to be collapsed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7192 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7193 DW_FUNCTION_DEFINITION(dw_tree_item_collapse, void, HWND handle, HTREEITEM item)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7194 DW_FUNCTION_ADD_PARAM2(handle, item)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7195 DW_FUNCTION_NO_RETURN(dw_tree_item_collapse)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7196 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, item, HTREEITEM)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7197 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7198 DW_FUNCTION_INIT;
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	7199 DWTree *tree = handle;
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	7200 [tree collapseItem:item];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7201 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7202 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7203
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7204 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7205 * Removes a node from a tree.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7206 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7207 * handle: Handle to the window (widget) to be cleared.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7208 * item: Handle to node to be deleted.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7209 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7210 DW_FUNCTION_DEFINITION(dw_tree_item_delete, void, HWND handle, HTREEITEM item)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7211 DW_FUNCTION_ADD_PARAM2(handle, item)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7212 DW_FUNCTION_NO_RETURN(dw_tree_item_delete)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7213 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, item, HTREEITEM)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7214 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7215 DW_FUNCTION_INIT;
682 de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	7216 DWTree *tree = handle;
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	7217 [tree deleteNode:item];
de4aa126fb2f Fixes for tree packing and a data source issue. Implemented most of the missing tree functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 681 diff changeset	7218 [tree reloadData];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7219 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7220 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7221
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7222 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7223 * Create a container object to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7224 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7225 * id: An ID to be used for getting the resource from the
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7226 * resource file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7227 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7228 DW_FUNCTION_DEFINITION(dw_container_new, HWND, ULONG cid, int multi)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7229 DW_FUNCTION_ADD_PARAM2(cid, multi)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7230 DW_FUNCTION_RETURN(dw_container_new, HWND)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7231 DW_FUNCTION_RESTORE_PARAM2(cid, ULONG, multi, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7232 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7233 DW_FUNCTION_INIT;
708 5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	7234 DWContainer *cont = _cont_new(cid, multi);
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	7235 NSScrollView *scrollview = [cont scrollview];
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	7236 [scrollview setHasHorizontalScroller:YES];
1557 030e9bddc1c9 Fixed some potential Objective-C memory leaks on Mac reported by XCode 4.2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	7237 NSTableHeaderView *header = [[[NSTableHeaderView alloc] init] autorelease];
708 5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	7238 [cont setHeaderView:header];
5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	7239 [cont setTarget:cont];
5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	7240 [cont setDoubleAction:@selector(doubleClicked:)];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7241 DW_FUNCTION_RETURN_THIS(cont);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7242 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7243
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7244 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7245 * Sets up the container columns.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7246 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7247 * handle: Handle to the container to be configured.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7248 * flags: An array of unsigned longs with column flags.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7249 * titles: An array of strings with column text titles.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7250 * count: The number of columns (this should match the arrays).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7251 * separator: The column number that contains the main separator.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7252 * (this item may only be used in OS/2)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7253 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7254 DW_FUNCTION_DEFINITION(dw_container_setup, int, HWND handle, unsigned long flags, char *titles, int count, int separator)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7255 DW_FUNCTION_ADD_PARAM5(handle, flags, titles, count, separator)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7256 DW_FUNCTION_RETURN(dw_container_setup, int)
1956 2924bc788170 Mac: Added code to avoid unused variable/parameter warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1955 diff changeset	7257 DW_FUNCTION_RESTORE_PARAM5(handle, HWND, flags, unsigned long , titles, char *, count, int, __DW_UNUSED__ separator, int)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7258 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7259 DW_FUNCTION_INIT;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7260 int z, retval = DW_ERROR_NONE;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7261 DWContainer *cont = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7262
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7263 [cont setup];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7264
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7265 for(z=0;z<count;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7266 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7267 NSTableColumn *column = [[NSTableColumn alloc] init];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7268 [[column headerCell] setStringValue:[ NSString stringWithUTF8String:titles[z] ]];
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	7269 if(flags[z] & DW_CFA_BITMAPORICON)
c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	7270 {
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	7271 NSImageCell *imagecell = [[NSImageCell alloc] init];
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	7272 [column setDataCell:imagecell];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	7273 [imagecell release];
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	7274 }
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7275 else if(flags[z] & DW_CFA_STRINGANDICON)
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7276 {
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	7277 DWImageAndTextCell *browsercell = [[DWImageAndTextCell alloc] init];
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7278 [column setDataCell:browsercell];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7279 [browsercell release];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7280 }
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7281 /* Defaults to left justified so just handle right and center */
1914 3872ab37297b Fix numerous deprecation warnings building with SDK 10.12 Sierra. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1908 diff changeset	7282 if(flags[z] & DW_CFA_RIGHT)
3872ab37297b Fix numerous deprecation warnings building with SDK 10.12 Sierra. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1908 diff changeset	7283 {
1940 38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	7284 [(NSCell *)[column dataCell] setAlignment:DWTextAlignmentRight];
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	7285 [(NSCell *)[column headerCell] setAlignment:DWTextAlignmentRight];
1914 3872ab37297b Fix numerous deprecation warnings building with SDK 10.12 Sierra. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1908 diff changeset	7286 }
3872ab37297b Fix numerous deprecation warnings building with SDK 10.12 Sierra. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1908 diff changeset	7287 else if(flags[z] & DW_CFA_CENTER)
3872ab37297b Fix numerous deprecation warnings building with SDK 10.12 Sierra. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1908 diff changeset	7288 {
1940 38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	7289 [(NSCell *)[column dataCell] setAlignment:DWTextAlignmentCenter];
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	7290 [(NSCell *)[column headerCell] setAlignment:DWTextAlignmentCenter];
38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	7291 }
795 f23cad02cfb3 Make listbox, container and tree cells uneditable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 794 diff changeset	7292 [column setEditable:NO];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7293 [cont addTableColumn:column];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7294 [cont addColumn:column andType:(int)flags[z]];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	7295 [column release];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7296 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7297 DW_FUNCTION_RETURN_THIS(retval);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7298 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7299
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7300 /*
1744 535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7301 * Configures the main filesystem columnn title for localization.
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7302 * Parameters:
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7303 * handle: Handle to the container to be configured.
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7304 * title: The title to be displayed in the main column.
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7305 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	7306 void API dw_filesystem_set_column_title(HWND handle, const char *title)
1744 535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7307 {
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7308 char *newtitle = strdup(title ? title : "");
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7309
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7310 dw_window_set_data(handle, "_dw_coltitle", newtitle);
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7311 }
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7312
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7313 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7314 * Sets up the filesystem columns, note: filesystem always has an icon/filename field.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7315 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7316 * handle: Handle to the container to be configured.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7317 * flags: An array of unsigned longs with column flags.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7318 * titles: An array of strings with column text titles.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7319 * count: The number of columns (this should match the arrays).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7320 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7321 int API dw_filesystem_setup(HWND handle, unsigned long flags, char *titles, int count)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7322 {
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7323 char *newtitles = malloc(sizeof(char ) * (count + 1));
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7324 unsigned long newflags = malloc(sizeof(unsigned long) (count + 1));
1744 535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7325 char coltitle = (char )dw_window_get_data(handle, "_dw_coltitle");
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	7326 DWContainer *cont = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7327
1744 535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7328 newtitles[0] = coltitle ? coltitle : "Filename";
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7329
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7330 newflags[0] = DW_CFA_STRINGANDICON \| DW_CFA_LEFT \| DW_CFA_HORZSEPARATOR;
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7331
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7332 memcpy(&newtitles[1], titles, sizeof(char ) count);
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7333 memcpy(&newflags[1], flags, sizeof(unsigned long) * count);
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7334
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7335 dw_container_setup(handle, newflags, newtitles, count + 1, 0);
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	7336 [cont setFilesystem:YES];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7337
1744 535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7338 if(coltitle)
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7339 {
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7340 dw_window_set_data(handle, "_dw_coltitle", NULL);
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7341 free(coltitle);
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7342 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7343 free(newtitles);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7344 free(newflags);
986 87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 983 diff changeset	7345 return DW_ERROR_NONE;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7346 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7347
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7348 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7349 * Allocates memory used to populate a container.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7350 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7351 * handle: Handle to the container window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7352 * rowcount: The number of items to be populated.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7353 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7354 DW_FUNCTION_DEFINITION(dw_container_alloc, void *, HWND handle, int rowcount)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7355 DW_FUNCTION_ADD_PARAM2(handle, rowcount)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7356 DW_FUNCTION_RETURN(dw_container_alloc, void *)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7357 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, rowcount, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7358 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7359 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7360 DWContainer *cont = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7361 [cont addRows:rowcount];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7362 DW_FUNCTION_RETURN_THIS(cont);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7363 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7364
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7365 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7366 * Sets an item in specified row and column to the given data.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7367 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7368 * handle: Handle to the container window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7369 * pointer: Pointer to the allocated memory in dw_container_alloc().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7370 * column: Zero based column of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7371 * row: Zero based row of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7372 * data: Pointer to the data to be added.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7373 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7374 DW_FUNCTION_DEFINITION(dw_container_set_item, void, HWND handle, void pointer, int column, int row, void data)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7375 DW_FUNCTION_ADD_PARAM5(handle, pointer, column, row, data)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7376 DW_FUNCTION_NO_RETURN(dw_container_set_item)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7377 DW_FUNCTION_RESTORE_PARAM5(handle, HWND, pointer, void , column, int, row, int, data, void )
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7378 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7379 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7380 DWContainer *cont = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7381 id object = nil;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7382 int type = [cont cellType:column];
801 5d8e4ecb7820 Think we need to ignore the last add point when the pointer argument is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 800 diff changeset	7383 int lastadd = 0;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	7384
801 5d8e4ecb7820 Think we need to ignore the last add point when the pointer argument is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 800 diff changeset	7385 /* If pointer is NULL we are getting a change request instead of set */
5d8e4ecb7820 Think we need to ignore the last add point when the pointer argument is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 800 diff changeset	7386 if(pointer)
5d8e4ecb7820 Think we need to ignore the last add point when the pointer argument is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 800 diff changeset	7387 {
5d8e4ecb7820 Think we need to ignore the last add point when the pointer argument is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 800 diff changeset	7388 lastadd = [cont lastAddPoint];
5d8e4ecb7820 Think we need to ignore the last add point when the pointer argument is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 800 diff changeset	7389 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7390
1502 dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7391 if(data)
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7392 {
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7393 if(type & DW_CFA_BITMAPORICON)
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7394 {
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7395 object = ((NSImage *)data);
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7396 }
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7397 else if(type & DW_CFA_STRING)
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7398 {
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7399 char str = ((char **)data);
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7400 object = [ NSString stringWithUTF8String:str ];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7401 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7402 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7403 {
1502 dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7404 char textbuffer[101] = {0};
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	7405
1502 dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7406 if(type & DW_CFA_ULONG)
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7407 {
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7408 ULONG tmp = ((ULONG )data);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	7409
1502 dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7410 snprintf(textbuffer, 100, "%lu", tmp);
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7411 }
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7412 else if(type & DW_CFA_DATE)
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7413 {
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7414 struct tm curtm;
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7415 CDATE cdate = ((CDATE )data);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	7416
1502 dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7417 memset( &curtm, 0, sizeof(curtm) );
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7418 curtm.tm_mday = cdate.day;
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7419 curtm.tm_mon = cdate.month - 1;
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7420 curtm.tm_year = cdate.year - 1900;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	7421
1502 dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7422 strftime(textbuffer, 100, "%x", &curtm);
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7423 }
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7424 else if(type & DW_CFA_TIME)
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7425 {
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7426 struct tm curtm;
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7427 CTIME ctime = ((CTIME )data);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	7428
1502 dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7429 memset( &curtm, 0, sizeof(curtm) );
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7430 curtm.tm_hour = ctime.hours;
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7431 curtm.tm_min = ctime.minutes;
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7432 curtm.tm_sec = ctime.seconds;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	7433
1502 dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7434 strftime(textbuffer, 100, "%X", &curtm);
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7435 }
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7436 if(textbuffer[0])
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7437 object = [ NSString stringWithUTF8String:textbuffer ];
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7438 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7439 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7440
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7441 [cont editCell:object at:(row+lastadd) and:column];
794 e9bc14c5c72d Test fix for containers (and probably listboxes) not showing their content changes immediately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 793 diff changeset	7442 [cont setNeedsDisplay:YES];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7443 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7444 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7445
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7446 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7447 * Changes an existing item in specified row and column to the given data.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7448 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7449 * handle: Handle to the container window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7450 * column: Zero based column of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7451 * row: Zero based row of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7452 * data: Pointer to the data to be added.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7453 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7454 void API dw_container_change_item(HWND handle, int column, int row, void *data)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7455 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7456 dw_container_set_item(handle, NULL, column, row, data);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7457 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7458
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7459 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7460 * Changes an existing item in specified row and column to the given data.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7461 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7462 * handle: Handle to the container window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7463 * column: Zero based column of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7464 * row: Zero based row of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7465 * data: Pointer to the data to be added.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7466 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7467 void API dw_filesystem_change_item(HWND handle, int column, int row, void *data)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7468 {
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7469 dw_container_change_item(handle, column+1, row, data);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7470 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7471
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7472 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7473 * Changes an item in specified row and column to the given data.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7474 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7475 * handle: Handle to the container window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7476 * pointer: Pointer to the allocated memory in dw_container_alloc().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7477 * column: Zero based column of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7478 * row: Zero based row of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7479 * data: Pointer to the data to be added.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7480 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	7481 void API dw_filesystem_change_file(HWND handle, int row, const char *filename, HICN icon)
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	7482 {
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7483 dw_filesystem_set_file(handle, NULL, row, filename, icon);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7484 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7485
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7486 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7487 * Sets an item in specified row and column to the given data.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7488 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7489 * handle: Handle to the container window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7490 * pointer: Pointer to the allocated memory in dw_container_alloc().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7491 * column: Zero based column of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7492 * row: Zero based row of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7493 * data: Pointer to the data to be added.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7494 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	7495 DW_FUNCTION_DEFINITION(dw_filesystem_set_file, void, HWND handle, void pointer, int row, const char filename, HICN icon)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7496 DW_FUNCTION_ADD_PARAM5(handle, pointer, row, filename, icon)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7497 DW_FUNCTION_NO_RETURN(dw_filesystem_set_file)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7498 DW_FUNCTION_RESTORE_PARAM5(handle, HWND, pointer, void , row, int, filename, char , icon, HICN)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7499 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7500 DW_FUNCTION_INIT;
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7501 DWContainer *cont = handle;
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	7502 DWImageAndTextCell *browsercell;
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7503 int lastadd = 0;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	7504
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7505 /* If pointer is NULL we are getting a change request instead of set */
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7506 if(pointer)
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7507 {
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7508 lastadd = [cont lastAddPoint];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7509 }
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	7510
1557 030e9bddc1c9 Fixed some potential Objective-C memory leaks on Mac reported by XCode 4.2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	7511 browsercell = [[[DWImageAndTextCell alloc] init] autorelease];
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7512 [browsercell setImage:icon];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7513 [browsercell setStringValue:[ NSString stringWithUTF8String:filename ]];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7514 [cont editCell:browsercell at:(row+lastadd) and:0];
1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7515 [cont setNeedsDisplay:YES];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7516 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7517 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7518
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7519 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7520 * Sets an item in specified row and column to the given data.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7521 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7522 * handle: Handle to the container window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7523 * pointer: Pointer to the allocated memory in dw_container_alloc().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7524 * column: Zero based column of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7525 * row: Zero based row of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7526 * data: Pointer to the data to be added.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7527 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7528 void API dw_filesystem_set_item(HWND handle, void pointer, int column, int row, void data)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7529 {
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7530 dw_container_set_item(handle, pointer, column+1, row, data);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7531 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7532
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7533 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7534 * Gets column type for a container column
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7535 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7536 * handle: Handle to the container window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7537 * column: Zero based column.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7538 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7539 DW_FUNCTION_DEFINITION(dw_container_get_column_type, int, HWND handle, int column)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7540 DW_FUNCTION_ADD_PARAM2(handle, column)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7541 DW_FUNCTION_RETURN(dw_container_get_column_type, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7542 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, column, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7543 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7544 DW_FUNCTION_INIT;
721 56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	7545 DWContainer *cont = handle;
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	7546 int rc;
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	7547 int flag = [cont cellType:column];
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	7548 if(flag & DW_CFA_BITMAPORICON)
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	7549 rc = DW_CFA_BITMAPORICON;
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	7550 else if(flag & DW_CFA_STRING)
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	7551 rc = DW_CFA_STRING;
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	7552 else if(flag & DW_CFA_ULONG)
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	7553 rc = DW_CFA_ULONG;
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	7554 else if(flag & DW_CFA_DATE)
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	7555 rc = DW_CFA_DATE;
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	7556 else if(flag & DW_CFA_TIME)
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	7557 rc = DW_CFA_TIME;
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	7558 else
56053f1af9ee Fixes for dw_container/filessystem_get_column_type from Mark Hessling... adding him to the copyright section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 720 diff changeset	7559 rc = 0;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7560 DW_FUNCTION_RETURN_THIS(rc);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7561 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7562
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7563 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7564 * Gets column type for a filesystem container column
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7565 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7566 * handle: Handle to the container window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7567 * column: Zero based column.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7568 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7569 int API dw_filesystem_get_column_type(HWND handle, int column)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7570 {
882 1e7b7f870d88 Experimental change to use a single column for holding the filename and icon on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 881 diff changeset	7571 return dw_container_get_column_type(handle, column+1);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7572 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7573
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7574 /*
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	7575 * Sets the alternating row colors for container window (widget) handle.
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	7576 * Parameters:
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	7577 * handle: The window (widget) handle.
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	7578 * oddcolor: Odd row background color in DW_RGB format or a default color index.
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	7579 * evencolor: Even row background color in DW_RGB format or a default color index.
1210 5a016a5a7412 Slight change in design behavior for dw_container_set_row_bg()... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1206 diff changeset	7580 * DW_RGB_TRANSPARENT will disable coloring rows.
5a016a5a7412 Slight change in design behavior for dw_container_set_row_bg()... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1206 diff changeset	7581 * DW_CLR_DEFAULT will use the system default alternating row colors.
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	7582 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7583 DW_FUNCTION_DEFINITION(dw_container_set_stripe, void, HWND handle, unsigned long oddcolor, unsigned long evencolor)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7584 DW_FUNCTION_ADD_PARAM3(handle, oddcolor, evencolor)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7585 DW_FUNCTION_NO_RETURN(dw_container_set_stripe)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7586 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, oddcolor, unsigned long, evencolor, unsigned long)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7587 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7588 DW_FUNCTION_INIT;
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	7589 DWContainer *cont = handle;
1958 45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	7590 [cont setRowBgOdd:oddcolor
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	7591 andEven:evencolor];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7592 DW_FUNCTION_RETURN_NOTHING;
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	7593 }
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	7594
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	7595 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7596 * Sets the width of a column in the container.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7597 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7598 * handle: Handle to window (widget) of container.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7599 * column: Zero based column of width being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7600 * width: Width of column in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7601 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7602 DW_FUNCTION_DEFINITION(dw_container_set_column_width, void, HWND handle, int column, int width)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7603 DW_FUNCTION_ADD_PARAM3(handle, column, width)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7604 DW_FUNCTION_NO_RETURN(dw_container_set_column_width)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7605 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, column, int, width, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7606 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7607 DW_FUNCTION_INIT;
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7608 DWContainer *cont = handle;
831 168b9db65825 Minor fix for dw_container_column_set_width() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 829 diff changeset	7609 if([cont filesystem])
168b9db65825 Minor fix for dw_container_column_set_width() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 829 diff changeset	7610 column++;
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7611 NSTableColumn *col = [cont getColumn:column];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7612
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7613 [col setWidth:width];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7614 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7615 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7616
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7617 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7618 * Sets the title of a row in the container.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7619 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7620 * pointer: Pointer to the allocated memory in dw_container_alloc().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7621 * row: Zero based row of data being set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7622 * title: String title of the item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7623 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	7624 DW_FUNCTION_DEFINITION(dw_container_set_row_title, void, void pointer, int row, const char title)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7625 DW_FUNCTION_ADD_PARAM3(pointer, row, title)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7626 DW_FUNCTION_NO_RETURN(dw_container_set_row_title)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7627 DW_FUNCTION_RESTORE_PARAM3(pointer, void , row, int, title, char )
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7628 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7629 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7630 DWContainer *cont = pointer;
821 00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	7631 int lastadd = [cont lastAddPoint];
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	7632 [cont setRow:(row+lastadd) title:title];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7633 DW_FUNCTION_RETURN_NOTHING;
821 00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	7634 }
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	7635
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	7636
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	7637 /*
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7638 * Sets the data pointer of a row in the container.
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7639 * Parameters:
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7640 * pointer: Pointer to the allocated memory in dw_container_alloc().
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7641 * row: Zero based row of data being set.
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7642 * data: Data pointer.
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7643 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7644 DW_FUNCTION_DEFINITION(dw_container_set_row_data, void, void pointer, int row, void data)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7645 DW_FUNCTION_ADD_PARAM3(pointer, row, data)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7646 DW_FUNCTION_NO_RETURN(dw_container_set_row_data)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7647 DW_FUNCTION_RESTORE_PARAM3(pointer, void , row, int, data, void )
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7648 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7649 DW_FUNCTION_INIT;
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7650 DWContainer *cont = pointer;
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7651 int lastadd = [cont lastAddPoint];
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7652 [cont setRowData:(row+lastadd) title:data];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7653 DW_FUNCTION_RETURN_NOTHING;
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7654 }
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7655
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7656
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7657 /*
821 00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	7658 * Sets the title of a row in the container.
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	7659 * Parameters:
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	7660 * handle: Handle to window (widget) of container.
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	7661 * row: Zero based row of data being set.
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	7662 * title: String title of the item.
00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	7663 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	7664 DW_FUNCTION_DEFINITION(dw_container_change_row_title, void, HWND handle, int row, const char *title)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7665 DW_FUNCTION_ADD_PARAM3(handle, row, title)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7666 DW_FUNCTION_NO_RETURN(dw_container_change_row_title)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7667 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, row, int, title, char *)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7668 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7669 DW_FUNCTION_INIT;
821 00fa951abeb5 Fix for dw_container_set_row_title() misbehavior on Mac and implemented dw_container_change_row_title(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 813 diff changeset	7670 DWContainer *cont = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7671 [cont setRow:row title:title];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7672 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7673 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7674
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7675 /*
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7676 * Sets the data pointer of a row in the container.
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7677 * Parameters:
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7678 * handle: Handle to window (widget) of container.
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7679 * row: Zero based row of data being set.
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7680 * data: Data pointer.
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7681 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7682 DW_FUNCTION_DEFINITION(dw_container_change_row_data, void, HWND handle, int row, void *data)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7683 DW_FUNCTION_ADD_PARAM3(handle, row, data)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7684 DW_FUNCTION_NO_RETURN(dw_container_change_row_data)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7685 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, row, int, data, void *)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7686 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7687 DW_FUNCTION_INIT;
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7688 DWContainer *cont = handle;
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7689 [cont setRowData:row title:data];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7690 DW_FUNCTION_RETURN_NOTHING;
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7691 }
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7692
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7693 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7694 * Sets the title of a row in the container.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7695 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7696 * handle: Handle to the container window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7697 * pointer: Pointer to the allocated memory in dw_container_alloc().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7698 * rowcount: The number of rows to be inserted.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7699 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7700 DW_FUNCTION_DEFINITION(dw_container_insert, void, HWND handle, void *pointer, int rowcount)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7701 DW_FUNCTION_ADD_PARAM3(handle, pointer, rowcount)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7702 DW_FUNCTION_NO_RETURN(dw_container_insert)
1956 2924bc788170 Mac: Added code to avoid unused variable/parameter warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1955 diff changeset	7703 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, __DW_UNUSED__ pointer, void *, __DW_UNUSED__ rowcount, int)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7704 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7705 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7706 DWContainer *cont = handle;
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	7707 [cont reloadData];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7708 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7709 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7710
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7711 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7712 * Removes all rows from a container.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7713 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7714 * handle: Handle to the window (widget) to be cleared.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7715 * redraw: TRUE to cause the container to redraw immediately.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7716 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7717 DW_FUNCTION_DEFINITION(dw_container_clear, void, HWND handle, int redraw)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7718 DW_FUNCTION_ADD_PARAM2(handle, redraw)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7719 DW_FUNCTION_NO_RETURN(dw_container_clear)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7720 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, redraw, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7721 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7722 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7723 DWContainer *cont = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7724 [cont clear];
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	7725 if(redraw)
0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	7726 [cont reloadData];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7727 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7728 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7729
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7730 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7731 * Removes the first x rows from a container.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7732 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7733 * handle: Handle to the window (widget) to be deleted from.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7734 * rowcount: The number of rows to be deleted.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7735 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7736 DW_FUNCTION_DEFINITION(dw_container_delete, void, HWND handle, int rowcount)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7737 DW_FUNCTION_ADD_PARAM2(handle, rowcount)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7738 DW_FUNCTION_NO_RETURN(dw_container_delete)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7739 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, rowcount, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7740 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7741 DW_FUNCTION_INIT;
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7742 DWContainer *cont = handle;
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7743 int x;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7744
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7745 for(x=0;x<rowcount;x++)
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7746 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7747 [cont removeRow:0];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7748 }
1705 3fa0448d3a7e Fixed a bug in dw_container_delete_row() on Mac and potentially a similar bug in dw_container_delete(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1704 diff changeset	7749 [cont reloadData];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7750 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7751 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7752
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7753 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7754 * Scrolls container up or down.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7755 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7756 * handle: Handle to the window (widget) to be scrolled.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7757 * direction: DW_SCROLL_UP, DW_SCROLL_DOWN, DW_SCROLL_TOP or
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7758 * DW_SCROLL_BOTTOM. (rows is ignored for last two)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7759 * rows: The number of rows to be scrolled.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7760 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7761 DW_FUNCTION_DEFINITION(dw_container_scroll, void, HWND handle, int direction, long rows)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7762 DW_FUNCTION_ADD_PARAM3(handle, direction, rows)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7763 DW_FUNCTION_NO_RETURN(dw_container_scroll)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7764 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, direction, int, rows, long)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7765 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7766 DW_FUNCTION_INIT;
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	7767 DWContainer *cont = handle;
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	7768 NSScrollView *sv = [cont scrollview];
852 bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7769 NSScroller *scrollbar = [sv verticalScroller];
855 0103a8751ab4 Removed an unnecessary method in the container (rowCount) and implemented container column alignment. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 854 diff changeset	7770 int rowcount = (int)[cont numberOfRowsInTableView:cont];
852 bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7771 float currpos = [scrollbar floatValue];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	7772 float change;
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	7773
853 c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	7774 /* Safety check */
c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	7775 if(rowcount < 1)
c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	7776 {
c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	7777 return;
c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	7778 }
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	7779
853 c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	7780 change = (float)rows/(float)rowcount;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	7781
852 bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7782 switch(direction)
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7783 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7784 case DW_SCROLL_TOP:
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7785 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7786 [scrollbar setFloatValue:0];
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7787 break;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7788 }
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7789 case DW_SCROLL_BOTTOM:
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7790 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7791 [scrollbar setFloatValue:1];
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7792 break;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7793 }
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7794 case DW_SCROLL_UP:
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7795 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7796 float newpos = currpos - change;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7797 if(newpos < 0)
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7798 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7799 newpos = 0;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7800 }
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7801 [scrollbar setFloatValue:newpos];
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7802 break;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7803 }
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7804 case DW_SCROLL_DOWN:
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7805 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7806 float newpos = currpos + change;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7807 if(newpos > 1)
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7808 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7809 newpos = 1;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7810 }
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7811 [scrollbar setFloatValue:newpos];
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7812 break;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7813 }
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7814 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7815 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7816 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7817
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7818 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7819 * Starts a new query of a container.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7820 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7821 * handle: Handle to the window (widget) to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7822 * flags: If this parameter is DW_CRA_SELECTED it will only
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7823 * return items that are currently selected. Otherwise
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7824 * it will return all records in the container.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7825 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7826 DW_FUNCTION_DEFINITION(dw_container_query_start, char *, HWND handle, unsigned long flags)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7827 DW_FUNCTION_ADD_PARAM2(handle, flags)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7828 DW_FUNCTION_RETURN(dw_container_query_start, char *)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7829 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, flags, unsigned long)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7830 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7831 DW_FUNCTION_INIT;
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7832 DWContainer *cont = handle;
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7833 NSIndexSet *selected = [cont selectedRowIndexes];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7834 NSUInteger result = [selected indexGreaterThanOrEqualToIndex:0];
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7835 void *retval = NULL;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7836
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7837 if(result != NSNotFound)
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7838 {
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7839 if(flags & DW_CR_RETDATA)
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7840 retval = [cont getRowData:(int)result];
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7841 else
1885 0768bbcf67e5 Need to duplicate container query results on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1874 diff changeset	7842 {
0768bbcf67e5 Need to duplicate container query results on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1874 diff changeset	7843 char *temp = [cont getRowTitle:(int)result];
0768bbcf67e5 Need to duplicate container query results on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1874 diff changeset	7844 if(temp)
0768bbcf67e5 Need to duplicate container query results on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1874 diff changeset	7845 retval = strdup(temp);
0768bbcf67e5 Need to duplicate container query results on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1874 diff changeset	7846 }
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7847 [cont setLastQueryPoint:(int)result];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7848 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7849 DW_FUNCTION_RETURN_THIS(retval);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7850 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7851
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7852 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7853 * Continues an existing query of a container.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7854 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7855 * handle: Handle to the window (widget) to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7856 * flags: If this parameter is DW_CRA_SELECTED it will only
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7857 * return items that are currently selected. Otherwise
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7858 * it will return all records in the container.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7859 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7860 DW_FUNCTION_DEFINITION(dw_container_query_next, char *, HWND handle, unsigned long flags)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7861 DW_FUNCTION_ADD_PARAM2(handle, flags)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7862 DW_FUNCTION_RETURN(dw_container_query_next, char *)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7863 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, flags, unsigned long)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7864 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7865 DW_FUNCTION_INIT;
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7866 DWContainer *cont = handle;
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7867 int lastQueryPoint = [cont lastQueryPoint];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7868 NSIndexSet *selected = [cont selectedRowIndexes];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7869 NSUInteger result = [selected indexGreaterThanIndex:lastQueryPoint];
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7870 void *retval = NULL;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7871
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7872 if(result != NSNotFound)
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7873 {
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7874 if(flags & DW_CR_RETDATA)
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7875 retval = [cont getRowData:(int)result];
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7876 else
1885 0768bbcf67e5 Need to duplicate container query results on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1874 diff changeset	7877 {
0768bbcf67e5 Need to duplicate container query results on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1874 diff changeset	7878 char *temp = [cont getRowTitle:(int)result];
0768bbcf67e5 Need to duplicate container query results on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1874 diff changeset	7879 if(temp)
0768bbcf67e5 Need to duplicate container query results on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1874 diff changeset	7880 retval = strdup(temp);
0768bbcf67e5 Need to duplicate container query results on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1874 diff changeset	7881 }
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7882 [cont setLastQueryPoint:(int)result];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7883 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7884 DW_FUNCTION_RETURN_THIS(retval);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7885 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7886
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7887 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7888 * Cursors the item with the text speficied, and scrolls to that item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7889 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7890 * handle: Handle to the window (widget) to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7891 * text: Text usually returned by dw_container_query().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7892 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	7893 DW_FUNCTION_DEFINITION(dw_container_cursor, void, HWND handle, const char *text)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7894 DW_FUNCTION_ADD_PARAM2(handle, text)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7895 DW_FUNCTION_NO_RETURN(dw_container_cursor)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7896 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, text, char *)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7897 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7898 DW_FUNCTION_INIT;
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	7899 DW_LOCAL_POOL_IN;
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7900 DWContainer *cont = handle;
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7901 char *thistext;
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7902 int x, count = (int)[cont numberOfRowsInTableView:cont];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7903
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7904 for(x=0;x<count;x++)
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7905 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7906 thistext = [cont getRowTitle:x];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7907
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7908 if(thistext && strcmp(thistext, text) == 0)
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7909 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7910 NSIndexSet *selected = [[NSIndexSet alloc] initWithIndex:(NSUInteger)x];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7911
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7912 [cont selectRowIndexes:selected byExtendingSelection:YES];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7913 [selected release];
1334 5e2ec37d1680 Attempt to make dw_container_cursor() scroll to the item on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1322 diff changeset	7914 [cont scrollRowToVisible:x];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7915 x=count;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7916 break;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7917 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7918 }
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	7919 DW_LOCAL_POOL_OUT;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7920 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7921 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7922
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7923 /*
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7924 * Cursors the item with the data speficied, and scrolls to that item.
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7925 * Parameters:
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7926 * handle: Handle to the window (widget) to be queried.
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7927 * data: Data associated with the row.
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7928 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7929 DW_FUNCTION_DEFINITION(dw_container_cursor_by_data, void, HWND handle, void *data)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7930 DW_FUNCTION_ADD_PARAM2(handle, data)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7931 DW_FUNCTION_NO_RETURN(dw_container_cursor_by_data)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7932 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, data, void *)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7933 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7934 DW_FUNCTION_INIT;
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7935 DW_LOCAL_POOL_IN;
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7936 DWContainer *cont = handle;
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7937 void *thisdata;
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7938 int x, count = (int)[cont numberOfRowsInTableView:cont];
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	7939
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7940 for(x=0;x<count;x++)
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7941 {
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7942 thisdata = [cont getRowData:x];
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	7943
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7944 if(thisdata == data)
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7945 {
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7946 NSIndexSet *selected = [[NSIndexSet alloc] initWithIndex:(NSUInteger)x];
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	7947
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7948 [cont selectRowIndexes:selected byExtendingSelection:YES];
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7949 [selected release];
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7950 [cont scrollRowToVisible:x];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7951 x=count;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7952 break;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7953 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7954 }
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7955 DW_LOCAL_POOL_OUT;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7956 DW_FUNCTION_RETURN_NOTHING;
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7957 }
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7958
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7959 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7960 * Deletes the item with the text speficied.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7961 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7962 * handle: Handle to the window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7963 * text: Text usually returned by dw_container_query().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7964 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	7965 DW_FUNCTION_DEFINITION(dw_container_delete_row, void, HWND handle, const char *text)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7966 DW_FUNCTION_ADD_PARAM2(handle, text)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7967 DW_FUNCTION_NO_RETURN(dw_container_delete_row)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7968 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, text, char *)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7969 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7970 DW_FUNCTION_INIT;
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7971 DWContainer *cont = handle;
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7972 char *thistext;
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7973 int x, count = (int)[cont numberOfRowsInTableView:cont];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7974
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7975 for(x=0;x<count;x++)
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7976 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7977 thistext = [cont getRowTitle:x];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7978
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7979 if(thistext && strcmp(thistext, text) == 0)
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7980 {
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7981 [cont removeRow:x];
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7982 [cont reloadData];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7983 x=count;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7984 break;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7985 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7986 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7987 DW_FUNCTION_RETURN_NOTHING;
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7988 }
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7989
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7990 /*
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7991 * Deletes the item with the data speficied.
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7992 * Parameters:
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7993 * handle: Handle to the window (widget).
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7994 * data: Data specified.
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7995 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7996 DW_FUNCTION_DEFINITION(dw_container_delete_row_by_data, void, HWND handle, void *data)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7997 DW_FUNCTION_ADD_PARAM2(handle, data)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7998 DW_FUNCTION_NO_RETURN(dw_container_delete_row_by_data)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7999 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, data, void *)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8000 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8001 DW_FUNCTION_INIT;
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	8002 DWContainer *cont = handle;
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	8003 void *thisdata;
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	8004 int x, count = (int)[cont numberOfRowsInTableView:cont];
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	8005
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	8006 for(x=0;x<count;x++)
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	8007 {
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	8008 thisdata = [cont getRowData:x];
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	8009
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	8010 if(thisdata == data)
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	8011 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	8012 [cont removeRow:x];
1705 3fa0448d3a7e Fixed a bug in dw_container_delete_row() on Mac and potentially a similar bug in dw_container_delete(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1704 diff changeset	8013 [cont reloadData];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8014 x=count;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8015 break;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8016 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8017 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8018 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8019 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8020
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8021 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8022 * Optimizes the column widths so that all data is visible.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8023 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8024 * handle: Handle to the window (widget) to be optimized.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8025 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8026 DW_FUNCTION_DEFINITION(dw_container_optimize, void, HWND handle)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8027 DW_FUNCTION_ADD_PARAM1(handle)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8028 DW_FUNCTION_NO_RETURN(dw_container_optimize)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8029 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8030 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8031 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8032 DWContainer *cont = handle;
856 9dc45928a75f Added method to do column optimizations like on other platforms. Figure out the maximum width for a column and sizing to that. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 855 diff changeset	8033 [cont optimize];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8034 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8035 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8036
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8037 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8038 * Inserts an icon into the taskbar.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8039 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8040 * handle: Window handle that will handle taskbar icon messages.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8041 * icon: Icon handle to display in the taskbar.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8042 * bubbletext: Text to show when the mouse is above the icon.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8043 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	8044 void API dw_taskbar_insert(HWND handle, HICN icon, const char *bubbletext)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8045 {
1943 469711814566 Mac: Fix NSStatusItem deprecation warnings by using the embedded NSStatusBarButton instead. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1942 diff changeset	8046 #ifdef BUILDING_FOR_YOSEMITE
1220 67ff39b9577c Initial implementation of dw_taskbar_* for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1215 diff changeset	8047 NSStatusItem *item = [[[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength] retain];
1943 469711814566 Mac: Fix NSStatusItem deprecation warnings by using the embedded NSStatusBarButton instead. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1942 diff changeset	8048 NSStatusBarButton *button = [item button];
1220 67ff39b9577c Initial implementation of dw_taskbar_* for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1215 diff changeset	8049 NSImage *image = icon;
1943 469711814566 Mac: Fix NSStatusItem deprecation warnings by using the embedded NSStatusBarButton instead. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1942 diff changeset	8050 [button setImage:image];
1220 67ff39b9577c Initial implementation of dw_taskbar_* for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1215 diff changeset	8051 if(bubbletext)
1943 469711814566 Mac: Fix NSStatusItem deprecation warnings by using the embedded NSStatusBarButton instead. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1942 diff changeset	8052 [button setToolTip:[NSString stringWithUTF8String:bubbletext]];
469711814566 Mac: Fix NSStatusItem deprecation warnings by using the embedded NSStatusBarButton instead. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1942 diff changeset	8053 [button setTarget:handle];
469711814566 Mac: Fix NSStatusItem deprecation warnings by using the embedded NSStatusBarButton instead. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1942 diff changeset	8054 [button setEnabled:YES];
469711814566 Mac: Fix NSStatusItem deprecation warnings by using the embedded NSStatusBarButton instead. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1942 diff changeset	8055 [[button cell] setHighlighted:YES];
469711814566 Mac: Fix NSStatusItem deprecation warnings by using the embedded NSStatusBarButton instead. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1942 diff changeset	8056 [button sendActionOn:(DWEventMaskLeftMouseUp\|DWEventMaskLeftMouseDown\|DWEventMaskRightMouseUp\|DWEventMaskRightMouseDown)];
469711814566 Mac: Fix NSStatusItem deprecation warnings by using the embedded NSStatusBarButton instead. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1942 diff changeset	8057 [button setAction:@selector(mouseDown:)];
1220 67ff39b9577c Initial implementation of dw_taskbar_* for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1215 diff changeset	8058 dw_window_set_data(handle, "_dw_taskbar", item);
1943 469711814566 Mac: Fix NSStatusItem deprecation warnings by using the embedded NSStatusBarButton instead. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1942 diff changeset	8059 #endif
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8060 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8061
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8062 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8063 * Deletes an icon from the taskbar.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8064 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8065 * handle: Window handle that was used with dw_taskbar_insert().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8066 * icon: Icon handle that was used with dw_taskbar_insert().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8067 */
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	8068 void API dw_taskbar_delete(HWND handle, HICN icon)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8069 {
1943 469711814566 Mac: Fix NSStatusItem deprecation warnings by using the embedded NSStatusBarButton instead. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1942 diff changeset	8070 #ifdef BUILDING_FOR_YOSEMITE
1220 67ff39b9577c Initial implementation of dw_taskbar_* for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1215 diff changeset	8071 NSStatusItem *item = dw_window_get_data(handle, "_dw_taskbar");
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	8072 DW_LOCAL_POOL_IN;
1220 67ff39b9577c Initial implementation of dw_taskbar_* for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1215 diff changeset	8073 [item release];
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	8074 DW_LOCAL_POOL_OUT;
1943 469711814566 Mac: Fix NSStatusItem deprecation warnings by using the embedded NSStatusBarButton instead. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1942 diff changeset	8075 #endif
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8076 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8077
1708 cc10082567ed Similar code for Mac to keep HICNs from getting too big. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1705 diff changeset	8078 /* Internal function to keep HICNs from getting too big */
cc10082567ed Similar code for Mac to keep HICNs from getting too big. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1705 diff changeset	8079 void _icon_resize(NSImage *image)
cc10082567ed Similar code for Mac to keep HICNs from getting too big. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1705 diff changeset	8080 {
1709 de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1708 diff changeset	8081 if(image)
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1708 diff changeset	8082 {
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1708 diff changeset	8083 NSSize size = [image size];
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1708 diff changeset	8084 if(size.width > 24 \|\| size.height > 24)
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1708 diff changeset	8085 {
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1708 diff changeset	8086 if(size.width > 24)
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1708 diff changeset	8087 size.width = 24;
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1708 diff changeset	8088 if(size.height > 24)
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1708 diff changeset	8089 size.height = 24;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	8090 [image setSize:size];
1709 de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1708 diff changeset	8091 }
1708 cc10082567ed Similar code for Mac to keep HICNs from getting too big. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1705 diff changeset	8092 }
cc10082567ed Similar code for Mac to keep HICNs from getting too big. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1705 diff changeset	8093 }
cc10082567ed Similar code for Mac to keep HICNs from getting too big. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1705 diff changeset	8094
1713 c836c6c33d8e Create an internal _dw_icon_load() which does not resize the image on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1712 diff changeset	8095 /* Internal version that does not resize the image */
c836c6c33d8e Create an internal _dw_icon_load() which does not resize the image on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1712 diff changeset	8096 HICN _dw_icon_load(unsigned long resid)
c836c6c33d8e Create an internal _dw_icon_load() which does not resize the image on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1712 diff changeset	8097 {
c836c6c33d8e Create an internal _dw_icon_load() which does not resize the image on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1712 diff changeset	8098 NSBundle *bundle = [NSBundle mainBundle];
c836c6c33d8e Create an internal _dw_icon_load() which does not resize the image on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1712 diff changeset	8099 NSString *respath = [bundle resourcePath];
1770 2396655d43f1 Fix some warnings with Mac 10.8 and Xcode 4.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	8100 NSString *filepath = [respath stringByAppendingFormat:@"/%lu.png", resid];
1713 c836c6c33d8e Create an internal _dw_icon_load() which does not resize the image on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1712 diff changeset	8101 NSImage *image = [[NSImage alloc] initWithContentsOfFile:filepath];
c836c6c33d8e Create an internal _dw_icon_load() which does not resize the image on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1712 diff changeset	8102 return image;
c836c6c33d8e Create an internal _dw_icon_load() which does not resize the image on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1712 diff changeset	8103 }
c836c6c33d8e Create an internal _dw_icon_load() which does not resize the image on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1712 diff changeset	8104
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8105 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8106 * Obtains an icon from a module (or header in GTK).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8107 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8108 * module: Handle to module (DLL) in OS/2 and Windows.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8109 * id: A unsigned long id int the resources on OS/2 and
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8110 * Windows, on GTK this is converted to a pointer
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8111 * to an embedded XPM.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8112 */
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	8113 HICN API dw_icon_load(unsigned long module, unsigned long resid)
c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	8114 {
1713 c836c6c33d8e Create an internal _dw_icon_load() which does not resize the image on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1712 diff changeset	8115 NSImage *image = _dw_icon_load(resid);
1708 cc10082567ed Similar code for Mac to keep HICNs from getting too big. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1705 diff changeset	8116 _icon_resize(image);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8117 return image;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8118 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8119
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8120 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8121 * Obtains an icon from a file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8122 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8123 * filename: Name of the file, omit extention to have
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8124 * DW pick the appropriate file extension.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8125 * (ICO on OS/2 or Windows, XPM on Unix)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8126 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	8127 HICN API dw_icon_load_from_file(const char *filename)
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	8128 {
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	8129 char *ext = _dw_get_image_extension( filename );
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	8130
674 78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	8131 NSString *nstr = [ NSString stringWithUTF8String:filename ];
78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	8132 NSImage *image = [[NSImage alloc] initWithContentsOfFile:nstr];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	8133 if(!image && ext)
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	8134 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	8135 nstr = [nstr stringByAppendingString: [NSString stringWithUTF8String:ext]];
674 78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	8136 image = [[NSImage alloc] initWithContentsOfFile:nstr];
78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	8137 }
1708 cc10082567ed Similar code for Mac to keep HICNs from getting too big. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1705 diff changeset	8138 _icon_resize(image);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8139 return image;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8140 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8141
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8142 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8143 * Obtains an icon from data
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8144 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8145 * filename: Name of the file, omit extention to have
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8146 * DW pick the appropriate file extension.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8147 * (ICO on OS/2 or Windows, XPM on Unix)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8148 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	8149 HICN API dw_icon_load_from_data(const char *data, int len)
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	8150 {
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8151 NSData *thisdata = [NSData dataWithBytes:data length:len];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8152 NSImage *image = [[NSImage alloc] initWithData:thisdata];
1708 cc10082567ed Similar code for Mac to keep HICNs from getting too big. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1705 diff changeset	8153 _icon_resize(image);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8154 return image;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8155 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8156
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8157 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8158 * Frees a loaded resource in OS/2 and Windows.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8159 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8160 * handle: Handle to icon returned by dw_icon_load().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8161 */
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	8162 void API dw_icon_free(HICN handle)
c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	8163 {
c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	8164 NSImage *image = handle;
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	8165 DW_LOCAL_POOL_IN;
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	8166 [image release];
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	8167 DW_LOCAL_POOL_OUT;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8168 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8169
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8170 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8171 * Create a new MDI Frame to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8172 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8173 * id: An ID to be used with dw_window_from_id or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8174 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	8175 HWND API dw_mdi_new(unsigned long cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8176 {
684 014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	8177 /* There isn't anything like quite like MDI on MacOS...
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	8178 * However we will make floating windows that hide
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	8179 * when the application is deactivated to simulate
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8180 * similar behavior.
684 014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	8181 */
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	8182 DWMDI *mdi = [[DWMDI alloc] init];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	8183 /* [mdi setTag:cid]; Why doesn't this work? */
684 014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	8184 return mdi;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8185 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8186
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8187 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8188 * Creates a splitbar window (widget) with given parameters.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8189 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8190 * type: Value can be DW_VERT or DW_HORZ.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8191 * topleft: Handle to the window to be top or left.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8192 * bottomright: Handle to the window to be bottom or right.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8193 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8194 * A handle to a splitbar window or NULL on failure.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8195 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8196 DW_FUNCTION_DEFINITION(dw_splitbar_new, HWND, int type, HWND topleft, HWND bottomright, unsigned long cid)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8197 DW_FUNCTION_ADD_PARAM4(type, topleft, bottomright, cid)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8198 DW_FUNCTION_RETURN(dw_splitbar_new, HWND)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8199 DW_FUNCTION_RESTORE_PARAM4(type, int, topleft, HWND, bottomright, HWND, cid, unsigned long)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8200 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8201 DW_FUNCTION_INIT;
1313 9f12bc79924b Autorelease fixes for Mac allowing the objects to dealloc when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1312 diff changeset	8202 id tmpbox = dw_box_new(DW_VERT, 0);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8203 DWSplitBar *split = [[DWSplitBar alloc] init];
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	8204 [split setDelegate:split];
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	8205 dw_box_pack_start(tmpbox, topleft, 0, 0, TRUE, TRUE, 0);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8206 [split addSubview:tmpbox];
1313 9f12bc79924b Autorelease fixes for Mac allowing the objects to dealloc when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1312 diff changeset	8207 [tmpbox autorelease];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8208 tmpbox = dw_box_new(DW_VERT, 0);
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	8209 dw_box_pack_start(tmpbox, bottomright, 0, 0, TRUE, TRUE, 0);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8210 [split addSubview:tmpbox];
1313 9f12bc79924b Autorelease fixes for Mac allowing the objects to dealloc when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1312 diff changeset	8211 [tmpbox autorelease];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8212 if(type == DW_VERT)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8213 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8214 [split setVertical:NO];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8215 }
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	8216 else
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	8217 {
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	8218 [split setVertical:YES];
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	8219 }
753 590eebc9b61f Preset the splitbar percent to 50% since Leopard doesn't set it automatically. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 752 diff changeset	8220 /* Set the default percent to 50% split */
590eebc9b61f Preset the splitbar percent to 50% since Leopard doesn't set it automatically. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 752 diff changeset	8221 [split setPercent:50.0];
1956 2924bc788170 Mac: Added code to avoid unused variable/parameter warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1955 diff changeset	8222 [split setTag:cid];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8223 DW_FUNCTION_RETURN_THIS(split);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8224 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8225
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8226 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8227 * Sets the position of a splitbar (pecentage).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8228 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8229 * handle: The handle to the splitbar returned by dw_splitbar_new().
1117 9ca5de2e59f8 Fixed the dw_splitbar_set() comment documentation. The percent parameter was missing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1115 diff changeset	8230 * percent: The position of the splitbar.
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8231 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8232 DW_FUNCTION_DEFINITION(dw_splitbar_set, void, HWND handle, float percent)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8233 DW_FUNCTION_ADD_PARAM2(handle, percent)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8234 DW_FUNCTION_NO_RETURN(dw_splitbar_set)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8235 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, percent, float)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8236 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8237 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8238 DWSplitBar *split = handle;
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8239 NSRect rect = [split frame];
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8240 float pos;
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	8241 /* Calculate the position based on the size */
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8242 if([split isVertical])
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8243 {
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	8244 pos = rect.size.width * (percent / 100.0);
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	8245 }
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	8246 else
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	8247 {
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8248 pos = rect.size.height * (percent / 100.0);
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8249 }
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	8250 if(pos > 0)
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	8251 {
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	8252 [split setPosition:pos ofDividerAtIndex:0];
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	8253 }
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8254 else
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8255 {
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	8256 /* If we have no size.. wait until the resize
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8257 * event when we get an actual size to try
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	8258 * to set the splitbar again.
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	8259 */
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	8260 [split setPercent:percent];
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8261 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8262 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8263 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8264
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8265 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8266 * Gets the position of a splitbar (pecentage).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8267 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8268 * handle: The handle to the splitbar returned by dw_splitbar_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8269 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8270 float API dw_splitbar_get(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8271 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8272 DWSplitBar *split = handle;
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8273 NSRect rect1 = [split frame];
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8274 NSArray *subviews = [split subviews];
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8275 NSView *view = [subviews objectAtIndex:0];
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8276 NSRect rect2 = [view frame];
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8277 float pos, total, retval = 0.0;
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8278 if([split isVertical])
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8279 {
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	8280 total = rect1.size.width;
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	8281 pos = rect2.size.width;
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8282 }
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8283 else
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8284 {
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	8285 total = rect1.size.height;
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	8286 pos = rect2.size.height;
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8287 }
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8288 if(total > 0)
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8289 {
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8290 retval = pos / total;
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8291 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8292 return retval;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8293 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8294
1146 9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8295 /* Internal function to convert fontname to NSFont */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	8296 NSFont _dw_font_by_name(const char fontname)
1146 9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8297 {
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8298 char *fontcopy = strdup(fontname);
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8299 char *name = strchr(fontcopy, '.');
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8300 NSFont *font = nil;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	8301
1146 9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8302 if(name)
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8303 {
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8304 int size = atoi(fontcopy);
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8305 *name = 0;
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8306 name++;
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8307 font = [NSFont fontWithName:[ NSString stringWithUTF8String:name ] size:(float)size];
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8308 }
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8309 free(fontcopy);
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8310 return font;
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8311 }
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8312
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8313 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8314 * Create a bitmap object to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8315 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8316 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8317 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8318 DW_FUNCTION_DEFINITION(dw_bitmap_new, HWND, ULONG cid)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8319 DW_FUNCTION_ADD_PARAM1(cid)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8320 DW_FUNCTION_RETURN(dw_bitmap_new, HWND)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8321 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8322 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8323 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8324 NSImageView *bitmap = [[NSImageView alloc] init];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8325 [bitmap setImageFrameStyle:NSImageFrameNone];
1902 74f50459c530 Fix some deprecations introduced in Mac OS X Yosemite 10.10... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1896 diff changeset	8326 [bitmap setImageScaling:NSImageScaleNone];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8327 [bitmap setEditable:NO];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	8328 [bitmap setTag:cid];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8329 DW_FUNCTION_RETURN_THIS(bitmap);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8330 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8331
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8332 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8333 * Creates a pixmap with given parameters.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8334 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8335 * handle: Window handle the pixmap is associated with.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8336 * width: Width of the pixmap in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8337 * height: Height of the pixmap in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8338 * depth: Color depth of the pixmap.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8339 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8340 * A handle to a pixmap or NULL on failure.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8341 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8342 HPIXMAP API dw_pixmap_new(HWND handle, unsigned long width, unsigned long height, int depth)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8343 {
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8344 HPIXMAP pixmap;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8345
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8346 if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8347 return NULL;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8348 pixmap->width = width;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8349 pixmap->height = height;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8350 pixmap->handle = handle;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	8351 pixmap->image = [[NSBitmapImageRep alloc]
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	8352 initWithBitmapDataPlanes:NULL
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	8353 pixelsWide:width
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	8354 pixelsHigh:height
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	8355 bitsPerSample:8
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	8356 samplesPerPixel:4
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	8357 hasAlpha:YES
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	8358 isPlanar:NO
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	8359 colorSpaceName:NSDeviceRGBColorSpace
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	8360 bytesPerRow:0
909 c092eab43ae3 Experimental change to pixmap rendering. Switch from using NSImage to NSBitmapImageRef to store the image. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 902 diff changeset	8361 bitsPerPixel:0];
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8362 return pixmap;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8363 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8364
957 beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8365 /* Function takes an NSImage and copies it into a flipped NSBitmapImageRep */
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8366 void _flip_image(NSImage tmpimage, NSBitmapImageRep image, NSSize size)
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8367 {
1940 38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	8368 NSCompositingOperation op = DWCompositingOperationSourceOver;
957 beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8369 [NSGraphicsContext saveGraphicsState];
1938 5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	8370 [NSGraphicsContext setCurrentContext:_dw_draw_context(image)];
1557 030e9bddc1c9 Fixed some potential Objective-C memory leaks on Mac reported by XCode 4.2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8371 [[[NSDictionary alloc] initWithObjectsAndKeys:image, NSGraphicsContextDestinationAttributeName, nil] autorelease];
1590 9eef6f82ee50 Comment cleanup in the Mac source. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1586 diff changeset	8372 /* Make a new transform */
981 536ec60ee433 Don't destroy a pixmap if the handle is null mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 980 diff changeset	8373 NSAffineTransform *t = [NSAffineTransform transform];
536ec60ee433 Don't destroy a pixmap if the handle is null mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 980 diff changeset	8374
1590 9eef6f82ee50 Comment cleanup in the Mac source. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1586 diff changeset	8375 /* By scaling Y negatively, we effectively flip the image */
981 536ec60ee433 Don't destroy a pixmap if the handle is null mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 980 diff changeset	8376 [t scaleXBy:1.0 yBy:-1.0];
536ec60ee433 Don't destroy a pixmap if the handle is null mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 980 diff changeset	8377
1590 9eef6f82ee50 Comment cleanup in the Mac source. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1586 diff changeset	8378 /* But we also have to translate it back by its height */
981 536ec60ee433 Don't destroy a pixmap if the handle is null mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 980 diff changeset	8379 [t translateXBy:0.0 yBy:-size.height];
536ec60ee433 Don't destroy a pixmap if the handle is null mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 980 diff changeset	8380
1590 9eef6f82ee50 Comment cleanup in the Mac source. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1586 diff changeset	8381 /* Apply the transform */
981 536ec60ee433 Don't destroy a pixmap if the handle is null mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 980 diff changeset	8382 [t concat];
536ec60ee433 Don't destroy a pixmap if the handle is null mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 980 diff changeset	8383 [tmpimage drawAtPoint:NSMakePoint(0, 0) fromRect:NSMakeRect(0, 0, size.width, size.height)
1914 3872ab37297b Fix numerous deprecation warnings building with SDK 10.12 Sierra. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1908 diff changeset	8384 operation:op fraction:1.0];
957 beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8385 [NSGraphicsContext restoreGraphicsState];
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8386 }
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8387
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8388 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8389 * Creates a pixmap from a file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8390 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8391 * handle: Window handle the pixmap is associated with.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8392 * filename: Name of the file, omit extention to have
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8393 * DW pick the appropriate file extension.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8394 * (BMP on OS/2 or Windows, XPM on Unix)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8395 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8396 * A handle to a pixmap or NULL on failure.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8397 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	8398 HPIXMAP API dw_pixmap_new_from_file(HWND handle, const char *filename)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8399 {
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8400 HPIXMAP pixmap;
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8401 DW_LOCAL_POOL_IN;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	8402 char *ext = _dw_get_image_extension( filename );
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8403
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8404 if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8405 {
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8406 DW_LOCAL_POOL_OUT;
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8407 return NULL;
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8408 }
674 78f9aa6d6d89 Fixes or fonts and loading images from files. Added Mac specific settings to dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 673 diff changeset	8409 NSString *nstr = [ NSString stringWithUTF8String:filename ];
1557 030e9bddc1c9 Fixed some potential Objective-C memory leaks on Mac reported by XCode 4.2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8410 NSImage *tmpimage = [[[NSImage alloc] initWithContentsOfFile:nstr] autorelease];
957 beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8411 if(!tmpimage && ext)
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	8412 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	8413 nstr = [nstr stringByAppendingString: [NSString stringWithUTF8String:ext]];
1557 030e9bddc1c9 Fixed some potential Objective-C memory leaks on Mac reported by XCode 4.2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8414 tmpimage = [[[NSImage alloc] initWithContentsOfFile:nstr] autorelease];
957 beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8415 }
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8416 if(!tmpimage)
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8417 {
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8418 DW_LOCAL_POOL_OUT;
957 beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8419 return NULL;
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8420 }
957 beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8421 NSSize size = [tmpimage size];
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8422 NSBitmapImageRep *image = [[NSBitmapImageRep alloc]
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8423 initWithBitmapDataPlanes:NULL
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8424 pixelsWide:size.width
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8425 pixelsHigh:size.height
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8426 bitsPerSample:8
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8427 samplesPerPixel:4
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8428 hasAlpha:YES
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8429 isPlanar:NO
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8430 colorSpaceName:NSDeviceRGBColorSpace
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8431 bytesPerRow:0
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8432 bitsPerPixel:0];
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8433 _flip_image(tmpimage, image, size);
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8434 pixmap->width = size.width;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8435 pixmap->height = size.height;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8436 pixmap->image = image;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8437 pixmap->handle = handle;
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8438 DW_LOCAL_POOL_OUT;
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8439 return pixmap;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8440 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8441
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8442 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8443 * Creates a pixmap from memory.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8444 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8445 * handle: Window handle the pixmap is associated with.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8446 * data: Source of the image data
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8447 * (BMP on OS/2 or Windows, XPM on Unix)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8448 * le: length of data
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8449 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8450 * A handle to a pixmap or NULL on failure.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8451 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	8452 HPIXMAP API dw_pixmap_new_from_data(HWND handle, const char *data, int len)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8453 {
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8454 HPIXMAP pixmap;
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8455 DW_LOCAL_POOL_IN;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8456
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8457 if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8458 {
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8459 DW_LOCAL_POOL_OUT;
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8460 return NULL;
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8461 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8462 NSData *thisdata = [NSData dataWithBytes:data length:len];
1557 030e9bddc1c9 Fixed some potential Objective-C memory leaks on Mac reported by XCode 4.2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8463 NSImage *tmpimage = [[[NSImage alloc] initWithData:thisdata] autorelease];
957 beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8464 if(!tmpimage)
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8465 {
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8466 DW_LOCAL_POOL_OUT;
957 beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8467 return NULL;
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8468 }
957 beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8469 NSSize size = [tmpimage size];
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8470 NSBitmapImageRep *image = [[NSBitmapImageRep alloc]
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8471 initWithBitmapDataPlanes:NULL
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8472 pixelsWide:size.width
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8473 pixelsHigh:size.height
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8474 bitsPerSample:8
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8475 samplesPerPixel:4
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8476 hasAlpha:YES
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8477 isPlanar:NO
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8478 colorSpaceName:NSDeviceRGBColorSpace
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8479 bytesPerRow:0
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8480 bitsPerPixel:0];
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8481 _flip_image(tmpimage, image, size);
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8482 pixmap->width = size.width;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8483 pixmap->height = size.height;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8484 pixmap->image = image;
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8485 pixmap->handle = handle;
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8486 DW_LOCAL_POOL_OUT;
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8487 return pixmap;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8488 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8489
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8490 /*
890 5a96cc2695b9 Removed dw_pixmap_set_transparent_color() from unimplemented on the Mac since it is handled automaticaly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 888 diff changeset	8491 * Sets the transparent color for a pixmap
5a96cc2695b9 Removed dw_pixmap_set_transparent_color() from unimplemented on the Mac since it is handled automaticaly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 888 diff changeset	8492 * Parameters:
5a96cc2695b9 Removed dw_pixmap_set_transparent_color() from unimplemented on the Mac since it is handled automaticaly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 888 diff changeset	8493 * pixmap: Handle to a pixmap returned by
5a96cc2695b9 Removed dw_pixmap_set_transparent_color() from unimplemented on the Mac since it is handled automaticaly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 888 diff changeset	8494 * dw_pixmap_new..
5a96cc2695b9 Removed dw_pixmap_set_transparent_color() from unimplemented on the Mac since it is handled automaticaly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 888 diff changeset	8495 * color: transparent color
5a96cc2695b9 Removed dw_pixmap_set_transparent_color() from unimplemented on the Mac since it is handled automaticaly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 888 diff changeset	8496 * Note: This does nothing on Mac as transparency
5a96cc2695b9 Removed dw_pixmap_set_transparent_color() from unimplemented on the Mac since it is handled automaticaly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 888 diff changeset	8497 * is handled automatically
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8498 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8499 void API dw_pixmap_set_transparent_color( HPIXMAP pixmap, ULONG color )
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8500 {
890 5a96cc2695b9 Removed dw_pixmap_set_transparent_color() from unimplemented on the Mac since it is handled automaticaly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 888 diff changeset	8501 /* Don't do anything */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8502 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8503
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8504 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8505 * Creates a pixmap from internal resource graphic specified by id.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8506 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8507 * handle: Window handle the pixmap is associated with.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8508 * id: Resource ID associated with requested pixmap.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8509 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8510 * A handle to a pixmap or NULL on failure.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8511 */
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	8512 HPIXMAP API dw_pixmap_grab(HWND handle, ULONG resid)
0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	8513 {
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8514 HPIXMAP pixmap;
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8515 DW_LOCAL_POOL_IN;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8516
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8517 if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8518 {
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8519 DW_LOCAL_POOL_OUT;
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8520 return NULL;
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8521 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8522
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	8523 NSBundle *bundle = [NSBundle mainBundle];
0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	8524 NSString *respath = [bundle resourcePath];
1770 2396655d43f1 Fix some warnings with Mac 10.8 and Xcode 4.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	8525 NSString *filepath = [respath stringByAppendingFormat:@"/%lu.png", resid];
1318 ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8526 NSImage *temp = [[NSImage alloc] initWithContentsOfFile:filepath];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	8527
1318 ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8528 if(temp)
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8529 {
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8530 NSSize size = [temp size];
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8531 NSBitmapImageRep *image = [[NSBitmapImageRep alloc]
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8532 initWithBitmapDataPlanes:NULL
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8533 pixelsWide:size.width
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8534 pixelsHigh:size.height
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8535 bitsPerSample:8
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8536 samplesPerPixel:4
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8537 hasAlpha:YES
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8538 isPlanar:NO
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8539 colorSpaceName:NSDeviceRGBColorSpace
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8540 bytesPerRow:0
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8541 bitsPerPixel:0];
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8542 _flip_image(temp, image, size);
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8543 pixmap->width = size.width;
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8544 pixmap->height = size.height;
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8545 pixmap->image = image;
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8546 pixmap->handle = handle;
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8547 [temp release];
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8548 return pixmap;
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8549 }
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8550 free(pixmap);
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8551 DW_LOCAL_POOL_OUT;
1318 ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8552 return NULL;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8553 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8554
1146 9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8555 /*
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8556 * Sets the font used by a specified pixmap.
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8557 * Normally the pixmap font is obtained from the associated window handle.
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8558 * However this can be used to override that, or for pixmaps with no window.
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8559 * Parameters:
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8560 * pixmap: Handle to a pixmap returned by dw_pixmap_new() or
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8561 * passed to the application via a callback.
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8562 * fontname: Name and size of the font in the form "size.fontname"
1147 091ed7c20b3f Implemented dw_pixmap_set_font() on Windows. Added to export files on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1146 diff changeset	8563 * Returns:
091ed7c20b3f Implemented dw_pixmap_set_font() on Windows. Added to export files on Windows and OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1146 diff changeset	8564 * DW_ERROR_NONE on success and DW_ERROR_GENERAL on failure.
1146 9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8565 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	8566 int API dw_pixmap_set_font(HPIXMAP pixmap, const char *fontname)
1146 9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8567 {
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8568 if(pixmap)
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8569 {
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8570 NSFont *font = _dw_font_by_name(fontname);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	8571
1146 9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8572 if(font)
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8573 {
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	8574 DW_LOCAL_POOL_IN;
1146 9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8575 NSFont *oldfont = pixmap->font;
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8576 [font retain];
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8577 pixmap->font = font;
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8578 if(oldfont)
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8579 [oldfont release];
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	8580 DW_LOCAL_POOL_OUT;
1146 9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8581 return DW_ERROR_NONE;
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8582 }
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8583 }
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8584 return DW_ERROR_GENERAL;
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8585 }
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8586
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8587 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8588 * Destroys an allocated pixmap.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8589 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8590 * pixmap: Handle to a pixmap returned by
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8591 * dw_pixmap_new..
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8592 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8593 void API dw_pixmap_destroy(HPIXMAP pixmap)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8594 {
1146 9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8595 if(pixmap)
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8596 {
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8597 NSBitmapImageRep image = (NSBitmapImageRep )pixmap->image;
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8598 NSFont *font = pixmap->font;
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	8599 DW_LOCAL_POOL_IN;
1146 9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8600 [image release];
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8601 [font release];
9d97610b2140 Adding dw_pixmap_set_font() which is equivalent to dw_window_set_font() except for pixmaps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1144 diff changeset	8602 free(pixmap);
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	8603 DW_LOCAL_POOL_OUT;
981 536ec60ee433 Don't destroy a pixmap if the handle is null mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 980 diff changeset	8604 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8605 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8606
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8607 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8608 * Copies from one item to another.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8609 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8610 * dest: Destination window handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8611 * destp: Destination pixmap. (choose only one).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8612 * xdest: X coordinate of destination.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8613 * ydest: Y coordinate of destination.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8614 * width: Width of area to copy.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8615 * height: Height of area to copy.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8616 * src: Source window handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8617 * srcp: Source pixmap. (choose only one).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8618 * xsrc: X coordinate of source.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8619 * ysrc: Y coordinate of source.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8620 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8621 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)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8622 {
1247 93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8623 dw_pixmap_stretch_bitblt(dest, destp, xdest, ydest, width, height, src, srcp, xsrc, ysrc, -1, -1);
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8624 }
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8625
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8626 /*
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8627 * Copies from one surface to another allowing for stretching.
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8628 * Parameters:
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8629 * dest: Destination window handle.
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8630 * destp: Destination pixmap. (choose only one).
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8631 * xdest: X coordinate of destination.
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8632 * ydest: Y coordinate of destination.
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8633 * width: Width of the target area.
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8634 * height: Height of the target area.
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8635 * src: Source window handle.
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8636 * srcp: Source pixmap. (choose only one).
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8637 * xsrc: X coordinate of source.
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8638 * ysrc: Y coordinate of source.
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8639 * srcwidth: Width of area to copy.
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8640 * srcheight: Height of area to copy.
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8641 * Returns:
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8642 * DW_ERROR_NONE on success and DW_ERROR_GENERAL on failure.
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8643 */
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8644 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)
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8645 {
1886 f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	8646 DWBitBlt *bltinfo;
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8647 NSValue* bi;
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8648 DW_LOCAL_POOL_IN;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	8649
1247 93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8650 /* Sanity checks */
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	8651 if((!dest && !destp) \|\| (!src && !srcp) \|\|
1247 93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8652 ((srcwidth == -1 \|\| srcheight == -1) && srcwidth != srcheight))
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8653 {
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8654 DW_LOCAL_POOL_OUT;
1247 93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8655 return DW_ERROR_GENERAL;
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8656 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	8657
1886 f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	8658 bltinfo = calloc(1, sizeof(DWBitBlt));
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	8659 bi = [NSValue valueWithPointer:bltinfo];
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	8660
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	8661 /* Fill in the information */
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	8662 bltinfo->dest = dest;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	8663 bltinfo->src = src;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	8664 bltinfo->xdest = xdest;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	8665 bltinfo->ydest = ydest;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	8666 bltinfo->width = width;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8667 bltinfo->height = height;
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	8668 bltinfo->xsrc = xsrc;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	8669 bltinfo->ysrc = ysrc;
1247 93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8670 bltinfo->srcwidth = srcwidth;
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8671 bltinfo->srcheight = srcheight;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8672
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	8673 if(destp)
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	8674 {
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8675 bltinfo->dest = (id)destp->image;
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	8676 }
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	8677 if(srcp)
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	8678 {
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	8679 id object = bltinfo->src = (id)srcp->image;
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	8680 [object retain];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8681 }
1953 77d156c3f01c Mac: Added a safeCall method to DWObject to make it easier to run things on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1952 diff changeset	8682 [DWObj safeCall:@selector(doBitBlt:) withObject:bi];
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8683 DW_LOCAL_POOL_OUT;
1247 93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8684 return DW_ERROR_NONE;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8685 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8686
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8687 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8688 * Create a new static text window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8689 * Not available under OS/2, eCS
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8690 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8691 * text: The text to be display by the static text widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8692 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8693 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	8694 HWND API dw_calendar_new(ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8695 {
729 6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	8696 DWCalendar *calendar = [[DWCalendar alloc] init];
6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	8697 [calendar setDatePickerMode:NSSingleDateMode];
6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	8698 [calendar setDatePickerStyle:NSClockAndCalendarDatePickerStyle];
6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	8699 [calendar setDatePickerElements:NSYearMonthDayDatePickerElementFlag];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	8700 [calendar setTag:cid];
1120 b2e060f43329 Initialize the calendar control to the current date during creation on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1117 diff changeset	8701 [calendar setDateValue:[NSDate date]];
729 6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	8702 return calendar;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8703 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8704
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8705 /*
2012 75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8706 * Sets the current date of a calendar.
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8707 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8708 * handle: The handle to the calendar returned by dw_calendar_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8709 * year...
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8710 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8711 void dw_calendar_set_date(HWND handle, unsigned int year, unsigned int month, unsigned int day)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8712 {
729 6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	8713 DWCalendar *calendar = handle;
6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	8714 NSDate *date;
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1303 diff changeset	8715 char buffer[101];
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	8716 DW_LOCAL_POOL_IN;
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1303 diff changeset	8717
1902 74f50459c530 Fix some deprecations introduced in Mac OS X Yosemite 10.10... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1896 diff changeset	8718 snprintf(buffer, 100, "%04d-%02d-%02d", year, month, day);
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	8719
1902 74f50459c530 Fix some deprecations introduced in Mac OS X Yosemite 10.10... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1896 diff changeset	8720 NSDateFormatter *dateFormatter = [[[NSDateFormatter alloc] init] autorelease];
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	8721 dateFormatter.dateFormat = @"yyyy-MM-dd";
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	8722
1902 74f50459c530 Fix some deprecations introduced in Mac OS X Yosemite 10.10... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1896 diff changeset	8723 date = [dateFormatter dateFromString:[NSString stringWithUTF8String:buffer]];
729 6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	8724 [calendar setDateValue:date];
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	8725 [date release];
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	8726 DW_LOCAL_POOL_OUT;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8727 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8728
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8729 /*
2012 75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8730 * Gets the current date of a calendar.
75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8731 * Parameters:
75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8732 * handle: The handle to the calendar returned by dw_calendar_new().
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8733 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8734 void dw_calendar_get_date(HWND handle, unsigned int year, unsigned int month, unsigned int *day)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8735 {
729 6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	8736 DWCalendar *calendar = handle;
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	8737 DW_LOCAL_POOL_IN;
2004 ebbdb2120659 Mac: Fix building on 10.9 and earlier due to changed constant names. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2002 diff changeset	8738 NSCalendar *mycalendar = [[NSCalendar alloc] initWithCalendarIdentifier:DWCalendarIdentifierGregorian];
729 6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	8739 NSDate *date = [calendar dateValue];
2004 ebbdb2120659 Mac: Fix building on 10.9 and earlier due to changed constant names. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2002 diff changeset	8740 NSDateComponents* components = [mycalendar components:DWCalendarUnitDay\|DWCalendarUnitMonth\|DWCalendarUnitYear fromDate:date];
2012 75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8741 *day = (unsigned int)[components day];
75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8742 *month = (unsigned int)[components month];
75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8743 *year = (unsigned int)[components year];
2002 a2931caa3422 Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1996 diff changeset	8744 [mycalendar release];
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	8745 DW_LOCAL_POOL_OUT;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8746 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8747
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8748 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8749 * Causes the embedded HTML widget to take action.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8750 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8751 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8752 * action: One of the DW_HTML_* constants.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8753 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8754 void API dw_html_action(HWND handle, int action)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8755 {
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	8756 DWWebView *html = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8757 switch(action)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8758 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8759 case DW_HTML_GOBACK:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8760 [html goBack];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8761 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8762 case DW_HTML_GOFORWARD:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8763 [html goForward];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8764 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8765 case DW_HTML_GOHOME:
2012 75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8766 dw_html_url(handle, DW_HOME_URL);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8767 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8768 case DW_HTML_SEARCH:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8769 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8770 case DW_HTML_RELOAD:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8771 [html reload:html];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8772 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8773 case DW_HTML_STOP:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8774 [html stopLoading:html];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8775 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8776 case DW_HTML_PRINT:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8777 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8778 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8779 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8780
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8781 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8782 * Render raw HTML code in the embedded HTML widget..
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8783 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8784 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8785 * string: String buffer containt HTML code to
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8786 * be rendered.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8787 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8788 * 0 on success.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8789 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	8790 int API dw_html_raw(HWND handle, const char *string)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8791 {
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	8792 DWWebView *html = handle;
1952 8ce5c562348f Mac: Attempting a better WKWebKit fix, use the WK_API_ENABLED constant to determine if the API is available. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1951 diff changeset	8793 #if WK_API_ENABLED
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	8794 [html loadHTMLString:[ NSString stringWithUTF8String:string ] baseURL:nil];
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	8795 #else
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8796 [[html mainFrame] loadHTMLString:[ NSString stringWithUTF8String:string ] baseURL:nil];
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	8797 #endif
2014 b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	8798 return DW_ERROR_NONE;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8799 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8800
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8801 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8802 * Render file or web page in the embedded HTML widget..
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8803 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8804 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8805 * url: Universal Resource Locator of the web or
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8806 * file object to be rendered.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8807 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8808 * 0 on success.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8809 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	8810 int API dw_html_url(HWND handle, const char *url)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8811 {
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	8812 DWWebView *html = handle;
1952 8ce5c562348f Mac: Attempting a better WKWebKit fix, use the WK_API_ENABLED constant to determine if the API is available. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1951 diff changeset	8813 #if WK_API_ENABLED
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	8814 [html loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[ NSString stringWithUTF8String:url ]]]];
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	8815 #else
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8816 [[html mainFrame] loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[ NSString stringWithUTF8String:url ]]]];
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	8817 #endif
2014 b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	8818 return DW_ERROR_NONE;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8819 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8820
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8821 /*
2012 75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8822 * Executes the javascript contained in "script" in the HTML window.
75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8823 * Parameters:
75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8824 * handle: Handle to the HTML window.
75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8825 * script: Javascript code to execute.
75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8826 * scriptdata: Data passed to the signal handler.
75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8827 * Notes: A DW_SIGNAL_HTML_RESULT event will be raised with scriptdata.
75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8828 * Returns:
75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8829 * DW_ERROR_NONE (0) on success.
75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8830 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	8831 int dw_html_javascript_run(HWND handle, const char script, void scriptdata)
2012 75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8832 {
2014 b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	8833 DWWebView *html = handle;
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	8834 DW_LOCAL_POOL_IN;
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	8835
2012 75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8836 #if WK_API_ENABLED
2020 59dfb86fb3b1 Mac: Implemented DW_SIGNAL_HTML_RESULT for all versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2014 diff changeset	8837 [html evaluateJavaScript:[NSString stringWithUTF8String:script] completionHandler:^(NSString result, NSError error)
59dfb86fb3b1 Mac: Implemented DW_SIGNAL_HTML_RESULT for all versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2014 diff changeset	8838 {
59dfb86fb3b1 Mac: Implemented DW_SIGNAL_HTML_RESULT for all versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2014 diff changeset	8839 void *params[2] = { result, scriptdata };
59dfb86fb3b1 Mac: Implemented DW_SIGNAL_HTML_RESULT for all versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2014 diff changeset	8840 _event_handler(html, (NSEvent *)params, 18);
59dfb86fb3b1 Mac: Implemented DW_SIGNAL_HTML_RESULT for all versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2014 diff changeset	8841 }];
2014 b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	8842 #else
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	8843 NSString *result = [html stringByEvaluatingJavaScriptFromString:[NSString stringWithUTF8String:script]];
2020 59dfb86fb3b1 Mac: Implemented DW_SIGNAL_HTML_RESULT for all versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2014 diff changeset	8844 void *params[2] = { result, scriptdata };
59dfb86fb3b1 Mac: Implemented DW_SIGNAL_HTML_RESULT for all versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2014 diff changeset	8845 _event_handler(html, (NSEvent *)params, 18);
2014 b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	8846 #endif
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	8847 DW_LOCAL_POOL_OUT;
2012 75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8848 return DW_ERROR_NONE;
75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8849 }
75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8850
75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8851 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8852 * Create a new HTML window (widget) to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8853 * Not available under OS/2, eCS
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8854 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8855 * text: The default text to be in the entryfield widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8856 * id: An ID to be used with dw_window_from_id() or 0L.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8857 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8858 DW_FUNCTION_DEFINITION(dw_html_new, HWND, ULONG cid)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8859 DW_FUNCTION_ADD_PARAM1(cid)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8860 DW_FUNCTION_RETURN(dw_html_new, HWND)
1956 2924bc788170 Mac: Added code to avoid unused variable/parameter warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1955 diff changeset	8861 DW_FUNCTION_RESTORE_PARAM1(__DW_UNUSED__ cid, ULONG)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8862 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8863 DW_FUNCTION_INIT;
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	8864 DWWebView *web = [[DWWebView alloc] init];
2013 7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	8865 #if WK_API_ENABLED
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	8866 web.navigationDelegate = web;
2014 b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	8867 #else
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	8868 web.frameLoadDelegate = web;
2013 7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	8869 #endif
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	8870 /* [web setTag:cid]; Why doesn't this work? */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8871 DW_FUNCTION_RETURN_THIS(web);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8872 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8873
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8874 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8875 * Returns the current X and Y coordinates of the mouse pointer.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8876 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8877 * x: Pointer to variable to store X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8878 * y: Pointer to variable to store Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8879 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8880 void API dw_pointer_query_pos(long x, long y)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8881 {
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8882 NSPoint mouseLoc;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8883 mouseLoc = [NSEvent mouseLocation];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8884 if(x)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8885 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8886 *x = mouseLoc.x;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8887 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8888 if(y)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8889 {
946 c64d3ca566f9 Attempt at inverting the window position and mouse pointer coordinates on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 945 diff changeset	8890 *y = [[NSScreen mainScreen] frame].size.height - mouseLoc.y;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8891 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8892 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8893
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8894 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8895 * Sets the X and Y coordinates of the mouse pointer.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8896 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8897 * x: X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8898 * y: Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8899 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8900 void API dw_pointer_set_pos(long x, long y)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8901 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8902 /* From what I have read this isn't possible, agaist human interface rules */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8903 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8904
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8905 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8906 * Create a menu object to be popped up.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8907 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8908 * id: An ID to be used for getting the resource from the
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8909 * resource file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8910 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	8911 HMENUI API dw_menu_new(ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8912 {
1313 9f12bc79924b Autorelease fixes for Mac allowing the objects to dealloc when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1312 diff changeset	8913 NSMenu *menu = [[NSMenu alloc] init];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8914 [menu setAutoenablesItems:NO];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	8915 /* [menu setTag:cid]; Why doesn't this work? */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8916 return menu;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8917 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8918
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8919 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8920 * Create a menubar on a window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8921 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8922 * location: Handle of a window frame to be attached to.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8923 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8924 HMENUI API dw_menubar_new(HWND location)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8925 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8926 NSWindow *window = location;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8927 NSMenu *windowmenu = _generate_main_menu();
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8928 [[window contentView] setMenu:windowmenu];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8929 return (HMENUI)windowmenu;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8930 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8931
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8932 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8933 * Destroys a menu created with dw_menubar_new or dw_menu_new.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8934 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8935 * menu: Handle of a menu.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8936 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8937 void API dw_menu_destroy(HMENUI *menu)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8938 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8939 NSMenu thismenu = menu;
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	8940 DW_LOCAL_POOL_IN;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8941 [thismenu release];
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	8942 DW_LOCAL_POOL_OUT;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8943 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8944
1903 b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8945 /* Handle deprecation of convertScreenToBase in 10.10 yet still supporting
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8946 * 10.6 and earlier since convertRectFromScreen was introduced in 10.7.
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8947 */
1904 2e456850e027 Minor fix for that last commit... code actually works now. ;) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1903 diff changeset	8948 NSPoint _windowPointFromScreen(id window, NSPoint p)
2e456850e027 Minor fix for that last commit... code actually works now. ;) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1903 diff changeset	8949 {
2e456850e027 Minor fix for that last commit... code actually works now. ;) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1903 diff changeset	8950 SEL crfs = NSSelectorFromString(@"convertRectFromScreen:");
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	8951
1903 b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8952 if([window respondsToSelector:crfs])
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8953 {
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8954 NSRect (* icrfs)(id, SEL, NSRect) = (NSRect (*)(id, SEL, NSRect))[window methodForSelector:crfs];
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8955 NSRect rect = icrfs(window, crfs, NSMakeRect(p.x, p.y, 1, 1));
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8956 return rect.origin;
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8957 }
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8958 else
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8959 {
1904 2e456850e027 Minor fix for that last commit... code actually works now. ;) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1903 diff changeset	8960 SEL cstb = NSSelectorFromString(@"convertScreenToBase:");
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	8961
1903 b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8962 if([window respondsToSelector:cstb])
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8963 {
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8964 NSPoint (* icstb)(id, SEL, NSPoint) = (NSPoint (*)(id, SEL, NSPoint))[window methodForSelector:cstb];
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8965 return icstb(window, cstb, p);
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8966 }
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8967 }
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8968 return NSMakePoint(0,0);
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8969 }
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8970
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8971 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8972 * Pops up a context menu at given x and y coordinates.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8973 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8974 * menu: The handle the the existing menu.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8975 * parent: Handle to the window initiating the popup.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8976 * x: X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8977 * y: Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8978 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8979 void API dw_menu_popup(HMENUI *menu, HWND parent, int x, int y)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8980 {
702 e9a3d1da3d3e dw_menu_popup() now uses the coordinates specified instead of the event coorindates. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 701 diff changeset	8981 NSMenu thismenu = (NSMenu )*menu;
711 82250177f814 Fix for popup menus not being created when window handle passed is a toplevel window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 710 diff changeset	8982 id object = parent;
82250177f814 Fix for popup menus not being created when window handle passed is a toplevel window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 710 diff changeset	8983 NSView *view = [object isKindOfClass:[NSWindow class]] ? [object contentView] : parent;
702 e9a3d1da3d3e dw_menu_popup() now uses the coordinates specified instead of the event coorindates. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 701 diff changeset	8984 NSWindow *window = [view window];
701 c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	8985 NSEvent *event = [DWApp currentEvent];
1225 f5b79d8b0694 Fixed positioning popup menu when the controlling window is not visible on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1222 diff changeset	8986 if(!window)
f5b79d8b0694 Fixed positioning popup menu when the controlling window is not visible on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1222 diff changeset	8987 window = [event window];
1313 9f12bc79924b Autorelease fixes for Mac allowing the objects to dealloc when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1312 diff changeset	8988 [thismenu autorelease];
946 c64d3ca566f9 Attempt at inverting the window position and mouse pointer coordinates on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 945 diff changeset	8989 NSPoint p = NSMakePoint(x, [[NSScreen mainScreen] frame].size.height - y);
1940 38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	8990 NSEvent* fake = [NSEvent mouseEventWithType:DWEventTypeRightMouseDown
1903 b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8991 location:_windowPointFromScreen(window, p)
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8992 modifierFlags:0
702 e9a3d1da3d3e dw_menu_popup() now uses the coordinates specified instead of the event coorindates. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 701 diff changeset	8993 timestamp:[event timestamp]
e9a3d1da3d3e dw_menu_popup() now uses the coordinates specified instead of the event coorindates. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 701 diff changeset	8994 windowNumber:[window windowNumber]
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8995 context:[NSGraphicsContext currentContext]
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8996 eventNumber:1
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8997 clickCount:1
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8998 pressure:0.0];
702 e9a3d1da3d3e dw_menu_popup() now uses the coordinates specified instead of the event coorindates. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 701 diff changeset	8999 [NSMenu popUpContextMenu:thismenu withEvent:fake forView:view];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9000 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9001
2037 a00e73284c97 Mac: Continuing const changes. Hopefully last Mac commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2035 diff changeset	9002 char _removetilde(char dest, const char src)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9003 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9004 int z, cur=0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9005 char accel = '\0';
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9006
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9007 for(z=0;z<strlen(src);z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9008 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9009 if(src[z] != '~')
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9010 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9011 dest[cur] = src[z];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9012 cur++;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9013 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9014 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9015 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9016 accel = src[z+1];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9017 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9018 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9019 dest[cur] = 0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9020 return accel;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9021 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9022
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9023 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9024 * Adds a menuitem or submenu to an existing menu.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9025 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9026 * menu: The handle the the existing menu.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9027 * title: The title text on the menu item to be added.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9028 * id: An ID to be used for message passing.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9029 * flags: Extended attributes to set on the menu.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9030 * end: If TRUE memu is positioned at the end of the menu.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9031 * check: If TRUE menu is "check"able.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9032 * flags: Extended attributes to set on the menu.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9033 * submenu: Handle to an existing menu to be a submenu or NULL.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9034 */
2037 a00e73284c97 Mac: Continuing const changes. Hopefully last Mac commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2035 diff changeset	9035 HWND API dw_menu_append_item(HMENUI menux, const char *title, ULONG itemid, ULONG flags, int end, int check, HMENUI submenux)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9036 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9037 NSMenu *menu = menux;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9038 NSMenu *submenu = submenux;
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	9039 DWMenuItem *item = NULL;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9040 if(strlen(title) == 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9041 {
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	9042 [menu addItem:[DWMenuItem separatorItem]];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9043 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9044 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9045 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9046 char accel[2];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9047 char *newtitle = malloc(strlen(title)+1);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9048 NSString *nstr;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9049
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9050 accel[0] = _removetilde(newtitle, title);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9051 accel[1] = 0;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9052
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9053 nstr = [ NSString stringWithUTF8String:newtitle ];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9054 free(newtitle);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9055
1313 9f12bc79924b Autorelease fixes for Mac allowing the objects to dealloc when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1312 diff changeset	9056 item = [[[DWMenuItem alloc] initWithTitle:nstr
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	9057 action:@selector(menuHandler:)
1313 9f12bc79924b Autorelease fixes for Mac allowing the objects to dealloc when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1312 diff changeset	9058 keyEquivalent:[ NSString stringWithUTF8String:accel ]] autorelease];
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	9059 [menu addItem:item];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9060
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9061 [item setTag:itemid];
1517 6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	9062 if(check)
6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	9063 {
6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	9064 [item setCheck:YES];
6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	9065 if(flags & DW_MIS_CHECKED)
6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	9066 {
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	9067 [item setState:DWControlStateValueOn];
1517 6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	9068 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9069 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9070 if(flags & DW_MIS_DISABLED)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9071 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9072 [item setEnabled:NO];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9073 }
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9074
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9075 if(submenux)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9076 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9077 [submenu setTitle:nstr];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9078 [menu setSubmenu:submenu forItem:item];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9079 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9080 return item;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9081 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9082 return item;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9083 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9084
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9085 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9086 * Sets the state of a menu item check.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9087 * Deprecated; use dw_menu_item_set_state()
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9088 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9089 * menu: The handle the the existing menu.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9090 * id: Menuitem id.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9091 * check: TRUE for checked FALSE for not checked.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9092 */
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	9093 void API dw_menu_item_set_check(HMENUI menux, unsigned long itemid, int check)
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	9094 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9095 id menu = menux;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9096 NSMenuItem menuitem = (NSMenuItem )[menu itemWithTag:itemid];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9097
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9098 if(menuitem != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9099 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9100 if(check)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9101 {
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	9102 [menuitem setState:DWControlStateValueOn];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9103 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9104 else
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9105 {
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	9106 [menuitem setState:DWControlStateValueOff];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9107 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9108 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9109 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9110
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9111 /*
1375 611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9112 * Deletes the menu item specified.
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9113 * Parameters:
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9114 * menu: The handle to the menu in which the item was appended.
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9115 * id: Menuitem id.
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9116 * Returns:
1375 611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9117 * DW_ERROR_NONE (0) on success or DW_ERROR_UNKNOWN on failure.
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9118 */
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9119 int API dw_menu_delete_item(HMENUI menux, unsigned long itemid)
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9120 {
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9121 id menu = menux;
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9122 NSMenuItem menuitem = (NSMenuItem )[menu itemWithTag:itemid];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9123
1375 611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9124 if(menuitem != nil)
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9125 {
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9126 [menu removeItem:menuitem];
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9127 return DW_ERROR_NONE;
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9128 }
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9129 return DW_ERROR_UNKNOWN;
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9130 }
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9131
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9132 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9133 * Sets the state of a menu item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9134 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9135 * menu: The handle to the existing menu.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9136 * id: Menuitem id.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9137 * flags: DW_MIS_ENABLED/DW_MIS_DISABLED
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9138 * DW_MIS_CHECKED/DW_MIS_UNCHECKED
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9139 */
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	9140 void API dw_menu_item_set_state(HMENUI menux, unsigned long itemid, unsigned long state)
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	9141 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9142 id menu = menux;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9143 NSMenuItem menuitem = (NSMenuItem )[menu itemWithTag:itemid];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9144
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9145 if(menuitem != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9146 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9147 if(state & DW_MIS_CHECKED)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9148 {
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	9149 [menuitem setState:DWControlStateValueOn];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9150 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9151 else if(state & DW_MIS_UNCHECKED)
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9152 {
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	9153 [menuitem setState:DWControlStateValueOff];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9154 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9155 if(state & DW_MIS_ENABLED)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9156 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9157 [menuitem setEnabled:YES];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9158 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9159 else if(state & DW_MIS_DISABLED)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9160 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9161 [menuitem setEnabled:NO];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9162 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9163 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9164 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9165
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	9166 /* Gets the notebook page from associated ID */
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	9167 DWNotebookPage _notepage_from_id(DWNotebook notebook, unsigned long pageid)
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	9168 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9169 NSArray *pages = [notebook tabViewItems];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9170 for(DWNotebookPage *notepage in pages)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9171 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9172 if([notepage pageid] == pageid)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9173 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9174 return notepage;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9175 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9176 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9177 return nil;
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	9178 }
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	9179
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9180 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9181 * Create a notebook object to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9182 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9183 * id: An ID to be used for getting the resource from the
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9184 * resource file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9185 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	9186 HWND API dw_notebook_new(ULONG cid, int top)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9187 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9188 DWNotebook *notebook = [[DWNotebook alloc] init];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9189 [notebook setDelegate:notebook];
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	9190 /* [notebook setTag:cid]; Why doesn't this work? */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9191 return notebook;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9192 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9193
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9194 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9195 * Adds a new page to specified notebook.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9196 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9197 * handle: Window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9198 * flags: Any additional page creation flags.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9199 * front: If TRUE page is added at the beginning.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9200 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9201 unsigned long API dw_notebook_page_new(HWND handle, ULONG flags, int front)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9202 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9203 DWNotebook *notebook = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9204 NSInteger page = [notebook pageid];
1907 54f9ec5bb793 XCode 7.0 reports that NSTabViewItem initWithIdentifier can't be NULL... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1906 diff changeset	9205 DWNotebookPage *notepage = [[DWNotebookPage alloc] initWithIdentifier:[NSString stringWithFormat: @"pageid:%d", (int)page]];
937 83aceaaef6ed Added initial support for allowing dW_window_destroy() to remove an item from its containing box on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 936 diff changeset	9206 [notepage setPageid:(int)page];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9207 if(front)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9208 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9209 [notebook insertTabViewItem:notepage atIndex:(NSInteger)0];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9210 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9211 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9212 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9213 [notebook addTabViewItem:notepage];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9214 }
1313 9f12bc79924b Autorelease fixes for Mac allowing the objects to dealloc when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1312 diff changeset	9215 [notepage autorelease];
937 83aceaaef6ed Added initial support for allowing dW_window_destroy() to remove an item from its containing box on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 936 diff changeset	9216 [notebook setPageid:(int)(page+1)];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9217 return (unsigned long)page;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9218 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9219
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9220 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9221 * Remove a page from a notebook.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9222 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9223 * handle: Handle to the notebook widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9224 * pageid: ID of the page to be destroyed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9225 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9226 void API dw_notebook_page_destroy(HWND handle, unsigned int pageid)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9227 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9228 DWNotebook *notebook = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9229 DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	9230 DW_LOCAL_POOL_IN;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9231
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9232 if(notepage != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9233 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9234 [notebook removeTabViewItem:notepage];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9235 }
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	9236 DW_LOCAL_POOL_OUT;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9237 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9238
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9239 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9240 * Queries the currently visible page ID.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9241 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9242 * handle: Handle to the notebook widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9243 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9244 unsigned long API dw_notebook_page_get(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9245 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9246 DWNotebook *notebook = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9247 DWNotebookPage notepage = (DWNotebookPage )[notebook selectedTabViewItem];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9248 return [notepage pageid];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9249 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9250
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9251 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9252 * Sets the currently visibale page ID.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9253 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9254 * handle: Handle to the notebook widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9255 * pageid: ID of the page to be made visible.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9256 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9257 void API dw_notebook_page_set(HWND handle, unsigned int pageid)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9258 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9259 DWNotebook *notebook = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9260 DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9261
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9262 if(notepage != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9263 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9264 [notebook selectTabViewItem:notepage];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9265 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9266 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9267
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9268 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9269 * Sets the text on the specified notebook tab.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9270 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9271 * handle: Notebook handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9272 * pageid: Page ID of the tab to set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9273 * text: Pointer to the text to set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9274 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	9275 void API dw_notebook_page_set_text(HWND handle, ULONG pageid, const char *text)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9276 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9277 DWNotebook *notebook = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9278 DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9279
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9280 if(notepage != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9281 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9282 [notepage setLabel:[ NSString stringWithUTF8String:text ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9283 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9284 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9285
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9286 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9287 * Sets the text on the specified notebook tab status area.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9288 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9289 * handle: Notebook handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9290 * pageid: Page ID of the tab to set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9291 * text: Pointer to the text to set.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9292 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	9293 void API dw_notebook_page_set_status_text(HWND handle, ULONG pageid, const char *text)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9294 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9295 /* Note supported here... do nothing */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9296 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9297
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9298 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9299 * Packs the specified box into the notebook page.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9300 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9301 * handle: Handle to the notebook to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9302 * pageid: Page ID in the notebook which is being packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9303 * page: Box handle to be packed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9304 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9305 void API dw_notebook_pack(HWND handle, ULONG pageid, HWND page)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9306 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9307 DWNotebook *notebook = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9308 DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9309
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9310 if(notepage != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9311 {
667 28727d9a835c Fix for a rather serious notebook layout bug. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 666 diff changeset	9312 HWND tmpbox = dw_box_new(DW_VERT, 0);
28727d9a835c Fix for a rather serious notebook layout bug. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 666 diff changeset	9313 DWBox *box = tmpbox;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9314
667 28727d9a835c Fix for a rather serious notebook layout bug. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 666 diff changeset	9315 dw_box_pack_start(tmpbox, page, 0, 0, TRUE, TRUE, 0);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9316 [notepage setView:box];
1862 9c7485b1921c Fixed object/signal/memory leak on Mac when destroying bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	9317 [box autorelease];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9318 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9319 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9320
1610 48a61abcd5bb Make sure source will build with Mac frameworks older than 10.7. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1607 diff changeset	9321 #ifndef NSWindowCollectionBehaviorFullScreenPrimary
48a61abcd5bb Make sure source will build with Mac frameworks older than 10.7. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1607 diff changeset	9322 #define NSWindowCollectionBehaviorFullScreenPrimary (1 << 7)
48a61abcd5bb Make sure source will build with Mac frameworks older than 10.7. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1607 diff changeset	9323 #endif
48a61abcd5bb Make sure source will build with Mac frameworks older than 10.7. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1607 diff changeset	9324
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9325 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9326 * Create a new Window Frame.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9327 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9328 * owner: The Owner's window handle or HWND_DESKTOP.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9329 * title: The Window title.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9330 * flStyle: Style flags, see the PM reference.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9331 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	9332 DW_FUNCTION_DEFINITION(dw_window_new, HWND, HWND hwndOwner, const char *title, ULONG flStyle)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	9333 DW_FUNCTION_ADD_PARAM3(hwndOwner, title, flStyle)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	9334 DW_FUNCTION_RETURN(dw_window_new, HWND)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	9335 DW_FUNCTION_RESTORE_PARAM3(hwndOwner, HWND, title, char *, flStyle, ULONG)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	9336 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	9337 DW_FUNCTION_INIT;
735 b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	9338 NSRect frame = NSMakeRect(1,1,1,1);
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	9339 DWWindow *window = [[DWWindow alloc]
735 b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	9340 initWithContentRect:frame
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9341 styleMask:(flStyle)
735 b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	9342 backing:NSBackingStoreBuffered
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	9343 defer:false];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9344
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9345 [window setTitle:[ NSString stringWithUTF8String:title ]];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9346
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9347 DWView *view = [[DWView alloc] init];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9348
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9349 [window setContentView:view];
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9350 [window setDelegate:view];
766 82cde14ec084 Enable recalculating the key view loop (keyboard focus list) automatically. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 763 diff changeset	9351 [window setAutorecalculatesKeyViewLoop:YES];
944 cdb7a53e5515 Some motion notify changes... so it can handle events without the mouse button pressed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 943 diff changeset	9352 [window setAcceptsMouseMovedEvents:YES];
1861 c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	9353 [window setReleasedWhenClosed:YES];
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	9354 [view autorelease];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9355
1607 d7fcea7bfcf9 Add full screen support for resizable windows on Mac 10.7. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1593 diff changeset	9356 /* Enable full screen mode on resizeable windows */
d7fcea7bfcf9 Add full screen support for resizable windows on Mac 10.7. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1593 diff changeset	9357 if(flStyle & DW_FCF_SIZEBORDER)
d7fcea7bfcf9 Add full screen support for resizable windows on Mac 10.7. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1593 diff changeset	9358 {
d7fcea7bfcf9 Add full screen support for resizable windows on Mac 10.7. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1593 diff changeset	9359 [window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
d7fcea7bfcf9 Add full screen support for resizable windows on Mac 10.7. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1593 diff changeset	9360 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9361
684 014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	9362 /* If it isn't a toplevel window... */
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	9363 if(hwndOwner)
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	9364 {
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	9365 id object = hwndOwner;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9366
684 014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	9367 /* Check to see if the parent is an MDI window */
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	9368 if([object isMemberOfClass:[DWMDI class]])
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	9369 {
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	9370 /* Set the window level to be floating */
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	9371 [window setLevel:NSFloatingWindowLevel];
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	9372 [window setHidesOnDeactivate:YES];
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	9373 }
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	9374 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	9375 DW_FUNCTION_RETURN_THIS(window);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9376 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9377
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9378 /*
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	9379 * Call a function from the window (widget)'s context.
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	9380 * Parameters:
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	9381 * handle: Window handle of the widget.
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	9382 * function: Function pointer to be called.
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	9383 * data: Pointer to the data to be passed to the function.
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	9384 */
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	9385 void API dw_window_function(HWND handle, void function, void data)
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	9386 {
735 b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	9387 void *params = calloc(2, sizeof(void ));
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	9388 NSValue *v;
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	9389 DW_LOCAL_POOL_IN;
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	9390 v = [NSValue valueWithPointer:params];
735 b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	9391 params[0] = function;
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	9392 params[1] = data;
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	9393 [DWObj performSelectorOnMainThread:@selector(doWindowFunc:) withObject:v waitUntilDone:YES];
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	9394 free(params);
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	9395 DW_LOCAL_POOL_OUT;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	9396 }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	9397
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	9398
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	9399 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9400 * Changes the appearance of the mouse pointer.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9401 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9402 * handle: Handle to widget for which to change.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9403 * cursortype: ID of the pointer you want.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9404 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9405 void API dw_window_set_pointer(HWND handle, int pointertype)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9406 {
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	9407 id object = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9408
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9409 if([ object isKindOfClass:[ NSView class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9410 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9411 NSView *view = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9412
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	9413 if(pointertype == DW_POINTER_DEFAULT)
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	9414 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	9415 [view discardCursorRects];
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	9416 }
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	9417 else if(pointertype == DW_POINTER_ARROW)
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	9418 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	9419 NSRect rect = [view frame];
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	9420 NSCursor *cursor = [NSCursor arrowCursor];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9421
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	9422 [view addCursorRect:rect cursor:cursor];
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	9423 }
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	9424 /* No cursor for DW_POINTER_CLOCK? */
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	9425 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9426 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9427
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9428 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9429 * Makes the window visible.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9430 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9431 * handle: The window handle to make visible.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9432 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9433 int API dw_window_show(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9434 {
735 b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	9435 NSObject *object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9436
1489 4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	9437 if([ object isMemberOfClass:[ DWWindow class ] ])
4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	9438 {
4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	9439 DWWindow *window = handle;
4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	9440 NSRect rect = [[window contentView] frame];
1795 9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9441 id defaultitem = [window initialFirstResponder];
1489 4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	9442
735 b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	9443 if([window isMiniaturized])
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	9444 {
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	9445 [window deminiaturize:nil];
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	9446 }
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	9447 /* If we haven't been sized by a call.. */
1489 4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	9448 if(rect.size.width <= 1 \|\| rect.size.height <= 1)
4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	9449 {
4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	9450 /* Determine the contents size */
4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	9451 dw_window_set_size(handle, 0, 0);
4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	9452 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9453 /* If the position was not set... generate a default
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9454 * default one in a similar pattern to SHELLPOSITION.
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9455 */
1489 4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	9456 if(![window shown])
4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	9457 {
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9458 static int defaultx = 0, defaulty = 0;
1497 99a53823079f On Mac lets just use the shown flag and not worry about the actual window position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1494 diff changeset	9459 int cx = dw_screen_width(), cy = dw_screen_height();
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9460 int maxx = cx / 4, maxy = cy / 4;
1497 99a53823079f On Mac lets just use the shown flag and not worry about the actual window position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1494 diff changeset	9461 NSPoint point;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9462
1489 4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	9463 rect = [window frame];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9464
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9465 defaultx += 20;
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9466 defaulty += 20;
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9467 if(defaultx > maxx)
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9468 defaultx = 20;
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9469 if(defaulty > maxy)
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9470 defaulty = 20;
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9471
1497 99a53823079f On Mac lets just use the shown flag and not worry about the actual window position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1494 diff changeset	9472 point.x = defaultx;
99a53823079f On Mac lets just use the shown flag and not worry about the actual window position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1494 diff changeset	9473 /* Take into account menu bar and inverted Y */
99a53823079f On Mac lets just use the shown flag and not worry about the actual window position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1494 diff changeset	9474 point.y = cy - defaulty - (int)rect.size.height - 22;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9475
1497 99a53823079f On Mac lets just use the shown flag and not worry about the actual window position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1494 diff changeset	9476 [window setFrameOrigin:point];
1490 5393b56ec6d0 Autoposition code should only be run the first time on Mac, regardless of whether it was needed or not. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1489 diff changeset	9477 [window setShown:YES];
735 b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	9478 }
930 b6ee515cad8a When getting dw_window_show() called on an unresized window... trigger a relayout on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 929 diff changeset	9479 [[window contentView] showWindow];
735 b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	9480 [window makeKeyAndOrderFront:nil];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9481
1940 38a50e0820b1 Mac: Moved all 10.12 related constants to the top of the source, vastly reducing the number of #ifdefs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1939 diff changeset	9482 if(!([window styleMask] & DWWindowStyleMaskResizable))
1782 d056a50196a9 Attempted fix at Mac textured background repeat problems. Thanks to Christoph Sinai bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1779 diff changeset	9483 {
d056a50196a9 Attempted fix at Mac textured background repeat problems. Thanks to Christoph Sinai bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1779 diff changeset	9484 /* Fix incorrect repeat in displaying textured windows */
d056a50196a9 Attempted fix at Mac textured background repeat problems. Thanks to Christoph Sinai bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1779 diff changeset	9485 [window setAutorecalculatesContentBorderThickness:NO forEdge:NSMinYEdge];
d056a50196a9 Attempted fix at Mac textured background repeat problems. Thanks to Christoph Sinai bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1779 diff changeset	9486 [window setContentBorderThickness:0.0 forEdge:NSMinYEdge];
d056a50196a9 Attempted fix at Mac textured background repeat problems. Thanks to Christoph Sinai bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1779 diff changeset	9487 }
1795 9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9488 if(defaultitem)
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9489 {
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9490 /* If there is a default item set, make it first responder */
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9491 [window makeFirstResponder:defaultitem];
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9492 }
735 b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	9493 }
b75be4860279 Possible fix for initial window creation with 0 size... not sure if the size I picked is good or not... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 734 diff changeset	9494 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9495 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9496
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9497 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9498 * Makes the window invisible.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9499 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9500 * handle: The window handle to make visible.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9501 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9502 int API dw_window_hide(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9503 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9504 NSObject *object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9505
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9506 if([ object isKindOfClass:[ NSWindow class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9507 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9508 NSWindow *window = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9509
733 8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	9510 [window orderOut:nil];
8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	9511 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9512 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9513 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9514
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9515 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9516 * Sets the colors used by a specified window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9517 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9518 * handle: The window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9519 * fore: Foreground color in DW_RGB format or a default color index.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9520 * back: Background color in DW_RGB format or a default color index.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9521 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9522 int API dw_window_set_color(HWND handle, ULONG fore, ULONG back)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9523 {
739 a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	9524 id object = handle;
a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	9525 unsigned long _fore = _get_color(fore);
a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	9526 unsigned long _back = _get_color(back);
811 50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9527 NSColor *fg = NULL;
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9528 NSColor *bg = NULL;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	9529
811 50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9530 /* Get the NSColor for non-default colors */
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9531 if(fore != DW_CLR_DEFAULT)
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9532 {
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9533 fg = [NSColor colorWithDeviceRed: DW_RED_VALUE(_fore)/255.0 green: DW_GREEN_VALUE(_fore)/255.0 blue: DW_BLUE_VALUE(_fore)/255.0 alpha: 1];
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9534 }
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9535 if(back != DW_CLR_DEFAULT)
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9536 {
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9537 bg = [NSColor colorWithDeviceRed: DW_RED_VALUE(_back)/255.0 green: DW_GREEN_VALUE(_back)/255.0 blue: DW_BLUE_VALUE(_back)/255.0 alpha: 1];
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9538 }
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9539
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9540 /* Get the textfield from the spinbutton */
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9541 if([object isMemberOfClass:[DWSpinButton class]])
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9542 {
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9543 object = [object textfield];
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9544 }
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9545 /* Get the cell on classes using NSCell */
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9546 if([object isKindOfClass:[NSTextField class]])
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9547 {
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9548 id cell = [object cell];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	9549
1849 b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	9550 [object setTextColor:(fg ? fg : [NSColor controlTextColor])];
1848 68f923e57542 Attempt at resetting default colors with DW_CLR_DEFAULT on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1843 diff changeset	9551 [cell setTextColor:(fg ? fg : [NSColor controlTextColor])];
811 50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9552 }
1849 b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	9553 if([object isMemberOfClass:[DWButton class]])
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	9554 {
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	9555 [object setTextColor:(fg ? fg : [NSColor controlTextColor])];
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	9556 }
811 50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9557 if([object isKindOfClass:[NSTextField class]] \|\| [object isKindOfClass:[NSButton class]])
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9558 {
50ed3e92215b Changes for dw_window_set_color() so it works on pretty much any control we support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 810 diff changeset	9559 id cell = [object cell];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	9560
1848 68f923e57542 Attempt at resetting default colors with DW_CLR_DEFAULT on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1843 diff changeset	9561 [cell setBackgroundColor:(bg ? bg : [NSColor controlColor])];
739 a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	9562 }
a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	9563 else if([object isMemberOfClass:[DWBox class]])
a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	9564 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9565 DWBox *box = object;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9566
1848 68f923e57542 Attempt at resetting default colors with DW_CLR_DEFAULT on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1843 diff changeset	9567 [box setColor:_back];
739 a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	9568 }
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	9569 else if([object isKindOfClass:[NSTableView class]])
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	9570 {
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	9571 DWContainer *cont = handle;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	9572
1848 68f923e57542 Attempt at resetting default colors with DW_CLR_DEFAULT on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1843 diff changeset	9573 [cont setBackgroundColor:(bg ? bg : [NSColor controlBackgroundColor])];
68f923e57542 Attempt at resetting default colors with DW_CLR_DEFAULT on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1843 diff changeset	9574 [cont setForegroundColor:(fg ? fg : [NSColor controlTextColor])];
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	9575 }
1543 b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	9576 else if([object isMemberOfClass:[DWMLE class]])
b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	9577 {
b86a04751ea0 Refactor MLE code on Mac to be more like the Container and Tree code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1538 diff changeset	9578 DWMLE *mle = handle;
1848 68f923e57542 Attempt at resetting default colors with DW_CLR_DEFAULT on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1843 diff changeset	9579 [mle setBackgroundColor:(bg ? bg : [NSColor controlBackgroundColor])];
68f923e57542 Attempt at resetting default colors with DW_CLR_DEFAULT on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1843 diff changeset	9580 NSTextStorage *ts = [mle textStorage];
68f923e57542 Attempt at resetting default colors with DW_CLR_DEFAULT on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1843 diff changeset	9581 [ts setForegroundColor:(fg ? fg : [NSColor controlTextColor])];
1128 7d7535f6bc4e Added ability to set background color of MLE; setting foreground still outstanding. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1120 diff changeset	9582 }
739 a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	9583 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9584 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9585
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9586 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9587 * Sets the font used by a specified window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9588 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9589 * handle: The window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9590 * border: Size of the window border in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9591 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9592 int API dw_window_set_border(HWND handle, int border)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9593 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9594 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9595 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9596
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9597 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9598 * Sets the style of a given window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9599 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9600 * handle: Window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9601 * width: New width in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9602 * height: New height in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9603 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9604 void API dw_window_set_style(HWND handle, ULONG style, ULONG mask)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9605 {
1778 e71ab68198ce Minor cleanups for the Mac status text changes for 10.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1776 diff changeset	9606 id object = _text_handle(handle);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9607
1773 da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	9608 if([object isMemberOfClass:[DWWindow class]])
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	9609 {
d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	9610 DWWindow *window = object;
1773 da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	9611 SEL sssm = NSSelectorFromString(@"setStyleMask");
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9612
1773 da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	9613 if([window respondsToSelector:sssm])
da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	9614 {
1993 e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	9615 DWIMP issm = (DWIMP)[window methodForSelector:sssm];
1773 da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	9616 int currentstyle = (int)[window styleMask];
da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	9617 int tmp;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9618
1773 da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	9619 tmp = currentstyle \| (int)mask;
da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	9620 tmp ^= mask;
da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	9621 tmp \|= style;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9622
1773 da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	9623 issm(window, sssm, tmp);
da7786b8573f Check if classes respond to selectors on Mac for new, removed and deprecated methods to avoid compiler warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1772 diff changeset	9624 }
751 eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	9625 }
740 bb3b2d804f0e Working on fonts some more.... setting a default label font that is smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 739 diff changeset	9626 else if([object isKindOfClass:[NSTextField class]])
bb3b2d804f0e Working on fonts some more.... setting a default label font that is smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 739 diff changeset	9627 {
bb3b2d804f0e Working on fonts some more.... setting a default label font that is smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 739 diff changeset	9628 NSTextField *tf = object;
1778 e71ab68198ce Minor cleanups for the Mac status text changes for 10.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1776 diff changeset	9629 DWTextFieldCell *cell = [tf cell];
e71ab68198ce Minor cleanups for the Mac status text changes for 10.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1776 diff changeset	9630
e71ab68198ce Minor cleanups for the Mac status text changes for 10.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1776 diff changeset	9631 [cell setAlignment:(style & 0xF)];
e71ab68198ce Minor cleanups for the Mac status text changes for 10.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1776 diff changeset	9632 if(mask & DW_DT_VCENTER && [cell isMemberOfClass:[DWTextFieldCell class]])
e71ab68198ce Minor cleanups for the Mac status text changes for 10.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1776 diff changeset	9633 {
e71ab68198ce Minor cleanups for the Mac status text changes for 10.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1776 diff changeset	9634 [cell setVCenter:(style & DW_DT_VCENTER ? YES : NO)];
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	9635 }
1788 9d499b162fe1 Discovered a breakage in OS/2 functionality when building bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1786 diff changeset	9636 if(mask & DW_DT_WORDBREAK && [cell isMemberOfClass:[DWTextFieldCell class]])
9d499b162fe1 Discovered a breakage in OS/2 functionality when building bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1786 diff changeset	9637 {
9d499b162fe1 Discovered a breakage in OS/2 functionality when building bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1786 diff changeset	9638 [cell setWraps:(style & DW_DT_WORDBREAK ? YES : NO)];
9d499b162fe1 Discovered a breakage in OS/2 functionality when building bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1786 diff changeset	9639 }
740 bb3b2d804f0e Working on fonts some more.... setting a default label font that is smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 739 diff changeset	9640 }
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	9641 else if([object isMemberOfClass:[NSTextView class]])
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	9642 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	9643 NSTextView *tv = handle;
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	9644 [tv setAlignment:(style & mask)];
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	9645 }
763 2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	9646 else if([object isMemberOfClass:[DWButton class]])
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	9647 {
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	9648 DWButton *button = handle;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	9649
763 2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	9650 if(mask & DW_BS_NOBORDER)
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	9651 {
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	9652 if(style & DW_BS_NOBORDER)
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	9653 [button setBordered:NO];
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	9654 else
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	9655 [button setBordered:YES];
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	9656 }
2cace4e6e69a Added DW_BS_NOBORDER style which can be set on buttons with dw_window_set_style() to make them flat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 762 diff changeset	9657 }
1314 c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1313 diff changeset	9658 else if([object isMemberOfClass:[DWMenuItem class]])
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1313 diff changeset	9659 {
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1313 diff changeset	9660 if(mask & (DW_MIS_CHECKED \| DW_MIS_UNCHECKED))
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1313 diff changeset	9661 {
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1313 diff changeset	9662 if(style & DW_MIS_CHECKED)
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	9663 [object setState:DWControlStateValueOn];
1314 c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1313 diff changeset	9664 else if(style & DW_MIS_UNCHECKED)
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	9665 [object setState:DWControlStateValueOff];
1314 c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1313 diff changeset	9666 }
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1313 diff changeset	9667 if(mask & (DW_MIS_ENABLED \| DW_MIS_DISABLED))
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1313 diff changeset	9668 {
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1313 diff changeset	9669 if(style & DW_MIS_ENABLED)
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1313 diff changeset	9670 [object setEnabled:YES];
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1313 diff changeset	9671 else if(style & DW_MIS_DISABLED)
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1313 diff changeset	9672 [object setEnabled:NO];
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1313 diff changeset	9673 }
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1313 diff changeset	9674 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9675 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9676
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9677 /*
1795 9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9678 * Sets the current focus item for a window/dialog.
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9679 * Parameters:
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9680 * handle: Handle to the dialog item to be focused.
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9681 * Remarks:
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9682 * This is for use after showing the window/dialog.
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9683 */
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9684 void API dw_window_set_focus(HWND handle)
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9685 {
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9686 id object = handle;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9687
1795 9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9688 [[object window] makeFirstResponder:object];
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9689 }
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9690
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9691 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9692 * Sets the default focus item for a window/dialog.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9693 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9694 * window: Toplevel window or dialog.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9695 * defaultitem: Handle to the dialog item to be default.
1795 9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9696 * Remarks:
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9697 * This is for use before showing the window/dialog.
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9698 */
766 82cde14ec084 Enable recalculating the key view loop (keyboard focus list) automatically. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 763 diff changeset	9699 void API dw_window_default(HWND handle, HWND defaultitem)
82cde14ec084 Enable recalculating the key view loop (keyboard focus list) automatically. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 763 diff changeset	9700 {
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	9701 DWWindow *window = handle;
872 13debcad9757 Another test fix at reported crash in dw_window_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 867 diff changeset	9702 id object = defaultitem;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	9703
872 13debcad9757 Another test fix at reported crash in dw_window_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 867 diff changeset	9704 if([window isKindOfClass:[NSWindow class]] && [object isKindOfClass:[NSControl class]])
864 ca01c7d95b80 Added some sanity checks for a couple of problem functions and default optimized container column width to 16 for image columns. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 860 diff changeset	9705 {
ca01c7d95b80 Added some sanity checks for a couple of problem functions and default optimized container column width to 16 for image columns. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 860 diff changeset	9706 [window setInitialFirstResponder:defaultitem];
ca01c7d95b80 Added some sanity checks for a couple of problem functions and default optimized container column width to 16 for image columns. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 860 diff changeset	9707 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9708 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9709
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9710 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9711 * Sets window to click the default dialog item when an ENTER is pressed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9712 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9713 * window: Window (widget) to look for the ENTER press.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9714 * next: Window (widget) to move to next (or click)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9715 */
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	9716 void API dw_window_click_default(HWND handle, HWND next)
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	9717 {
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	9718 id object = handle;
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	9719 id control = next;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	9720
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	9721 if([object isMemberOfClass:[DWWindow class]])
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	9722 {
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	9723 if([control isMemberOfClass:[DWButton class]])
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	9724 {
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	9725 NSWindow *window = object;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	9726
1935 994e2360dbb2 Fix crash on macos with clicking a default button set with dw_windows_click_default mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1934 diff changeset	9727 [window setDefaultButtonCell:[control cell]];
792 fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	9728 }
768 7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	9729 }
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	9730 else
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	9731 {
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	9732 if([control isMemberOfClass:[DWSpinButton class]])
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	9733 {
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	9734 control = [control textfield];
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	9735 }
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	9736 else if([control isMemberOfClass:[DWComboBox class]])
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	9737 {
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	9738 /* TODO: Figure out why the combobox can't be
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	9739 * focused using makeFirstResponder method.
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	9740 */
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	9741 control = [control textfield];
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	9742 }
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	9743 [object setClickDefault:control];
7a236fdcf4ba Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 767 diff changeset	9744 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9745 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9746
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9747 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9748 * Captures the mouse input to this window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9749 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9750 * handle: Handle to receive mouse input.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9751 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9752 void API dw_window_capture(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9753 {
949 451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	9754 /* Don't do anything for now */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9755 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9756
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9757 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9758 * Releases previous mouse capture.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9759 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9760 void API dw_window_release(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9761 {
949 451c71b7fdb1 Changed dw_window_capture() an dw_window_release() because the mouseDragged method does this already. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 948 diff changeset	9762 /* Don't do anything for now */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9763 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9764
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9765 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9766 * Changes a window's parent to newparent.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9767 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9768 * handle: The window handle to destroy.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9769 * newparent: The window's new parent window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9770 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9771 void API dw_window_reparent(HWND handle, HWND newparent)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9772 {
686 218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9773 id object = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9774
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	9775 if([object isMemberOfClass:[DWWindow class]])
686 218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9776 {
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9777 /* We can't actually reparent on MacOS but if the
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9778 * new parent is an MDI window, change to be a
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9779 * floating window... otherwise set it to normal.
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9780 */
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9781 NSWindow *window = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9782
686 218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9783 /* If it isn't a toplevel window... */
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9784 if(newparent)
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9785 {
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9786 object = newparent;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9787
686 218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9788 /* Check to see if the parent is an MDI window */
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9789 if([object isMemberOfClass:[DWMDI class]])
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9790 {
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9791 /* Set the window level to be floating */
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9792 [window setLevel:NSFloatingWindowLevel];
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9793 [window setHidesOnDeactivate:YES];
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9794 return;
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9795 }
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9796 }
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9797 /* Set the window back to a normal window */
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9798 [window setLevel:NSNormalWindowLevel];
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9799 [window setHidesOnDeactivate:NO];
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9800 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9801 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9802
1051 6919854298fd Added dw_font_choose() on Windows for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1050 diff changeset	9803 /* Allows the user to choose a font using the system's font chooser dialog.
6919854298fd Added dw_font_choose() on Windows for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1050 diff changeset	9804 * Parameters:
6919854298fd Added dw_font_choose() on Windows for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1050 diff changeset	9805 * currfont: current font
1050 48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9806 * Returns:
1051 6919854298fd Added dw_font_choose() on Windows for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1050 diff changeset	9807 * A malloced buffer with the selected font or NULL on error.
1050 48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9808 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	9809 char * API dw_font_choose(const char *currfont)
1050 48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9810 {
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9811 /* Create the Color Chooser Dialog class. */
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9812 static DWFontChoose *fontDlg = nil;
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9813 static NSFontManager *fontManager = nil;
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9814 DWDialog *dialog;
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9815 NSFont *font = nil;
1068 efaa9ceeb253 Removed test for class member for itemdata in dw_tree_item_get_data() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1067 diff changeset	9816
1050 48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9817 if(currfont)
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9818 font = _dw_font_by_name(currfont);
1068 efaa9ceeb253 Removed test for class member for itemdata in dw_tree_item_get_data() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1067 diff changeset	9819
1050 48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9820 if(fontDlg)
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9821 {
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9822 dialog = [fontDlg dialog];
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9823 /* If someone is already waiting just return */
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9824 if(dialog)
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9825 {
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9826 return NULL;
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9827 }
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9828 }
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9829 else
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9830 {
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9831 [NSFontManager setFontPanelFactory:[DWFontChoose class]];
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9832 fontManager = [NSFontManager sharedFontManager];
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9833 fontDlg = (DWFontChoose *)[fontManager fontPanel:YES];
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9834 }
1068 efaa9ceeb253 Removed test for class member for itemdata in dw_tree_item_get_data() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1067 diff changeset	9835
1050 48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9836 dialog = dw_dialog_new(fontDlg);
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9837 if(font)
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9838 [fontManager setSelectedFont:font isMultiple:NO];
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9839 else
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9840 [fontManager setSelectedFont:[NSFont fontWithName:@"Helvetica" size:9.0] isMultiple:NO];
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9841 [fontDlg setDialog:dialog];
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9842 [fontDlg setFontManager:fontManager];
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9843 [fontManager orderFrontFontPanel:fontManager];
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9844
1068 efaa9ceeb253 Removed test for class member for itemdata in dw_tree_item_get_data() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1067 diff changeset	9845
1050 48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9846 /* Wait for them to pick a color */
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9847 font = (NSFont *)dw_dialog_wait(dialog);
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9848 if(font)
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9849 {
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9850 NSString *fontname = [font displayName];
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9851 NSString *output = [NSString stringWithFormat:@"%d.%s", (int)[font pointSize], [fontname UTF8String]];
1068 efaa9ceeb253 Removed test for class member for itemdata in dw_tree_item_get_data() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1067 diff changeset	9852 return strdup([output UTF8String]);
1050 48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9853 }
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9854 return NULL;
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9855 }
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9856
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9857 /* Internal function to return a pointer to an item struct
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9858 * with information about the packing information regarding object.
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9859 */
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9860 Item *_box_item(id object)
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9861 {
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9862 /* Find the item within the box it is packed into */
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9863 if([object isKindOfClass:[DWBox class]] \|\| [object isKindOfClass:[DWGroupBox class]] \|\| [object isKindOfClass:[NSControl class]])
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9864 {
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9865 DWBox parent = (DWBox )[object superview];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9866
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9867 /* Some controls are embedded in scrollviews...
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9868 * so get the parent of the scrollview in that case.
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9869 */
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9870 if([object isKindOfClass:[NSTableView class]] && [parent isMemberOfClass:[NSClipView class]])
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9871 {
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9872 object = [parent superview];
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9873 parent = (DWBox *)[object superview];
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9874 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9875
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9876 if([parent isKindOfClass:[DWBox class]] \|\| [parent isKindOfClass:[DWGroupBox class]])
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9877 {
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9878 Box *thisbox = [parent box];
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9879 Item *thisitem = thisbox->items;
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9880 int z;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9881
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9882 for(z=0;z<thisbox->count;z++)
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9883 {
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9884 if(thisitem[z].hwnd == object)
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9885 return &thisitem[z];
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9886 }
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9887 }
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9888 }
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9889 return NULL;
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9890 }
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9891
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9892 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9893 * Sets the font used by a specified window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9894 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9895 * handle: The window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9896 * fontname: Name and size of the font in the form "size.fontname"
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9897 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	9898 int API dw_window_set_font(HWND handle, const char *fontname)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9899 {
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	9900 NSFont *font = _dw_font_by_name(fontname);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9901
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	9902 if(font)
740 bb3b2d804f0e Working on fonts some more.... setting a default label font that is smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 739 diff changeset	9903 {
1772 5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	9904 id object = _text_handle(handle);
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	9905 if([object window])
673 6d0f0dc7ff7c Some minor font fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 672 diff changeset	9906 {
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	9907 [object lockFocus];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	9908 [font set];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	9909 [object unlockFocus];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	9910 }
1040 7ea8a428e0cc Attempt at adding support for groupboxes to dw_window_set/get_font() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1027 diff changeset	9911 if([object isMemberOfClass:[DWGroupBox class]])
7ea8a428e0cc Attempt at adding support for groupboxes to dw_window_set/get_font() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1027 diff changeset	9912 {
7ea8a428e0cc Attempt at adding support for groupboxes to dw_window_set/get_font() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1027 diff changeset	9913 [object setTitleFont:font];
7ea8a428e0cc Attempt at adding support for groupboxes to dw_window_set/get_font() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1027 diff changeset	9914 }
7ea8a428e0cc Attempt at adding support for groupboxes to dw_window_set/get_font() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1027 diff changeset	9915 else if([object isKindOfClass:[NSControl class]])
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	9916 {
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	9917 [object setFont:font];
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	9918 [[object cell] setFont:font];
673 6d0f0dc7ff7c Some minor font fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 672 diff changeset	9919 }
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	9920 else if([object isMemberOfClass:[DWRender class]])
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	9921 {
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	9922 DWRender *render = object;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9923
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	9924 [render setFont:font];
d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	9925 }
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9926 else
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9927 return DW_ERROR_UNKNOWN;
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9928 /* If we changed the text... */
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9929 Item *item = _box_item(handle);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9930
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9931 /* Check to see if any of the sizes need to be recalculated */
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9932 if(item && (item->origwidth == -1 \|\| item->origheight == -1))
1422 131bedf41332 Initial support for automatic redrawing on Windows and ranged/bitmap auto-calculation support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1421 diff changeset	9933 {
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9934 _control_size(handle, item->origwidth == -1 ? &item->width : NULL, item->origheight == -1 ? &item->height : NULL);
1422 131bedf41332 Initial support for automatic redrawing on Windows and ranged/bitmap auto-calculation support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1421 diff changeset	9935 /* Queue a redraw on the top-level window */
131bedf41332 Initial support for automatic redrawing on Windows and ranged/bitmap auto-calculation support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1421 diff changeset	9936 _dw_redraw([object window], TRUE);
131bedf41332 Initial support for automatic redrawing on Windows and ranged/bitmap auto-calculation support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1421 diff changeset	9937 }
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9938 return DW_ERROR_NONE;
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9939 }
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9940 return DW_ERROR_UNKNOWN;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9941 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9942
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9943 /*
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9944 * Returns the current font for the specified window
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9945 * Parameters:
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9946 * handle: The window handle from which to obtain the font.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9947 */
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9948 char * API dw_window_get_font(HWND handle)
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9949 {
1772 5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	9950 id object = _text_handle(handle);
1040 7ea8a428e0cc Attempt at adding support for groupboxes to dw_window_set/get_font() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1027 diff changeset	9951 NSFont *font = nil;
7ea8a428e0cc Attempt at adding support for groupboxes to dw_window_set/get_font() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1027 diff changeset	9952
7ea8a428e0cc Attempt at adding support for groupboxes to dw_window_set/get_font() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1027 diff changeset	9953 if([object isMemberOfClass:[DWGroupBox class]])
7ea8a428e0cc Attempt at adding support for groupboxes to dw_window_set/get_font() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1027 diff changeset	9954 {
7ea8a428e0cc Attempt at adding support for groupboxes to dw_window_set/get_font() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1027 diff changeset	9955 font = [object titleFont];
7ea8a428e0cc Attempt at adding support for groupboxes to dw_window_set/get_font() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1027 diff changeset	9956 }
7ea8a428e0cc Attempt at adding support for groupboxes to dw_window_set/get_font() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1027 diff changeset	9957 else if([object isKindOfClass:[NSControl class]] \|\| [object isMemberOfClass:[DWRender class]])
7ea8a428e0cc Attempt at adding support for groupboxes to dw_window_set/get_font() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1027 diff changeset	9958 {
7ea8a428e0cc Attempt at adding support for groupboxes to dw_window_set/get_font() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1027 diff changeset	9959 font = [object font];
7ea8a428e0cc Attempt at adding support for groupboxes to dw_window_set/get_font() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1027 diff changeset	9960 }
7ea8a428e0cc Attempt at adding support for groupboxes to dw_window_set/get_font() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1027 diff changeset	9961 if(font)
7ea8a428e0cc Attempt at adding support for groupboxes to dw_window_set/get_font() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1027 diff changeset	9962 {
1041 6a57bf20d8f9 Return displayName property instead of fontName property in dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1040 diff changeset	9963 NSString *fontname = [font displayName];
739 a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	9964 NSString *output = [NSString stringWithFormat:@"%d.%s", (int)[font pointSize], [fontname UTF8String]];
a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	9965 return strdup([output UTF8String]);
a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	9966 }
a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	9967 return NULL;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9968 }
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9969
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9970 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9971 * Destroys a window and all of it's children.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9972 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9973 * handle: The window handle to destroy.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9974 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	9975 DW_FUNCTION_DEFINITION(dw_window_destroy, int, HWND handle)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	9976 DW_FUNCTION_ADD_PARAM1(handle)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	9977 DW_FUNCTION_RETURN(dw_window_destroy, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	9978 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	9979 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	9980 DW_FUNCTION_INIT;
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	9981 DW_LOCAL_POOL_IN;
937 83aceaaef6ed Added initial support for allowing dW_window_destroy() to remove an item from its containing box on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 936 diff changeset	9982 id object = handle;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	9983 int retval = 0;
937 83aceaaef6ed Added initial support for allowing dW_window_destroy() to remove an item from its containing box on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 936 diff changeset	9984
1375 611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9985 /* Handle destroying a top-level window */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9986 if([ object isKindOfClass:[ NSWindow class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9987 {
1313 9f12bc79924b Autorelease fixes for Mac allowing the objects to dealloc when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1312 diff changeset	9988 DWWindow *window = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9989 [window close];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9990 }
1375 611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9991 /* Handle removing menu items from menus */
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9992 else if([ object isKindOfClass:[NSMenuItem class]])
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9993 {
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9994 NSMenu *menu = [object menu];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9995
1376 52bbb1acce61 Don't release the menu item when destroying it on Mac... causes crashes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1375 diff changeset	9996 [menu removeItem:object];
1375 611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9997 }
937 83aceaaef6ed Added initial support for allowing dW_window_destroy() to remove an item from its containing box on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 936 diff changeset	9998 /* Handle destroying a control or box */
1664 4ec0bce77f70 Fix dw_window_destroy() failing on splitbars and possibly other widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1654 diff changeset	9999 else if([object isKindOfClass:[NSView class]] \|\| [object isKindOfClass:[NSControl class]])
937 83aceaaef6ed Added initial support for allowing dW_window_destroy() to remove an item from its containing box on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 936 diff changeset	10000 {
83aceaaef6ed Added initial support for allowing dW_window_destroy() to remove an item from its containing box on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 936 diff changeset	10001 DWBox parent = (DWBox )[object superview];
983 6abf763838c6 Allow checboxes and other "buttons" to have a blank title instead of the default "Button" mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 982 diff changeset	10002
6abf763838c6 Allow checboxes and other "buttons" to have a blank title instead of the default "Button" mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 982 diff changeset	10003 /* Some controls are embedded in scrollviews...
979 f6234f870e81 Attempt at fixing dw_window_destroy() for controls that are embedded in scrollviews on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 957 diff changeset	10004 * so get the parent of the scrollview in that case.
f6234f870e81 Attempt at fixing dw_window_destroy() for controls that are embedded in scrollviews on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 957 diff changeset	10005 */
1549 ca6be9c48fff Implemented auto-sizing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1543 diff changeset	10006 if(([object isKindOfClass:[NSTableView class]] \|\| [object isMemberOfClass:[DWMLE class]])
ca6be9c48fff Implemented auto-sizing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1543 diff changeset	10007 && [parent isMemberOfClass:[NSClipView class]])
982 a4425bb24b77 Fixed dw_window_destroy() on container and trees... there are multiple parts to scrollviews aparently on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 981 diff changeset	10008 {
a4425bb24b77 Fixed dw_window_destroy() on container and trees... there are multiple parts to scrollviews aparently on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 981 diff changeset	10009 object = [parent superview];
980 94dde9b3dfc0 Ok so we need to set the object to be the right value in this case so it gets removed from the proper view on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 979 diff changeset	10010 parent = (DWBox *)[object superview];
979 f6234f870e81 Attempt at fixing dw_window_destroy() for controls that are embedded in scrollviews on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 957 diff changeset	10011 }
940 b5ae9cf15f68 Fix for returning wrong extension in _dw_get_image_extension; only worked for .ico files mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 939 diff changeset	10012
1099 d1cea9be1436 Fixed dw_window_destroy() with groupboxes on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1098 diff changeset	10013 if([parent isKindOfClass:[DWBox class]] \|\| [parent isKindOfClass:[DWGroupBox class]])
937 83aceaaef6ed Added initial support for allowing dW_window_destroy() to remove an item from its containing box on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 936 diff changeset	10014 {
1671 d5f39d32c4da Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1664 diff changeset	10015 id window = [object window];
937 83aceaaef6ed Added initial support for allowing dW_window_destroy() to remove an item from its containing box on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 936 diff changeset	10016 Box *thisbox = [parent box];
83aceaaef6ed Added initial support for allowing dW_window_destroy() to remove an item from its containing box on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 936 diff changeset	10017 int z, index = -1;
1764 5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	10018 Item tmpitem = NULL, thisitem = thisbox->items;
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	10019
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	10020 if(!thisitem)
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	10021 thisbox->count = 0;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10022
937 83aceaaef6ed Added initial support for allowing dW_window_destroy() to remove an item from its containing box on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 936 diff changeset	10023 for(z=0;z<thisbox->count;z++)
83aceaaef6ed Added initial support for allowing dW_window_destroy() to remove an item from its containing box on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 936 diff changeset	10024 {
982 a4425bb24b77 Fixed dw_window_destroy() on container and trees... there are multiple parts to scrollviews aparently on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 981 diff changeset	10025 if(thisitem[z].hwnd == object)
937 83aceaaef6ed Added initial support for allowing dW_window_destroy() to remove an item from its containing box on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 936 diff changeset	10026 index = z;
83aceaaef6ed Added initial support for allowing dW_window_destroy() to remove an item from its containing box on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 936 diff changeset	10027 }
940 b5ae9cf15f68 Fix for returning wrong extension in _dw_get_image_extension; only worked for .ico files mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 939 diff changeset	10028
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10029 if(index != -1)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10030 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10031 [object removeFromSuperview];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10032
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10033 if(thisbox->count > 1)
1764 5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	10034 {
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10035 tmpitem = calloc(sizeof(Item), (thisbox->count-1));
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10036
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10037 /* Copy all but the current entry to the new list */
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10038 for(z=0;z<index;z++)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10039 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10040 tmpitem[z] = thisitem[z];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10041 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10042 for(z=index+1;z<thisbox->count;z++)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10043 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10044 tmpitem[z-1] = thisitem[z];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10045 }
1764 5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	10046 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10047
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10048 thisbox->items = tmpitem;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10049 if(thisitem)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10050 free(thisitem);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10051 if(tmpitem)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10052 thisbox->count--;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10053 else
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10054 thisbox->count = 0;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10055
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10056 /* Queue a redraw on the top-level window */
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10057 _dw_redraw(window, TRUE);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10058 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10059 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10060 }
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	10061 DW_LOCAL_POOL_OUT;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10062 DW_FUNCTION_RETURN_THIS(retval);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10063 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10064
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10065 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10066 * Gets the text used for a given window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10067 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10068 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10069 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10070 * text: The text associsated with a given window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10071 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10072 DW_FUNCTION_DEFINITION(dw_window_get_text, char *, HWND handle)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10073 DW_FUNCTION_ADD_PARAM1(handle)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10074 DW_FUNCTION_RETURN(dw_window_get_text, char *)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10075 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10076 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10077 DW_FUNCTION_INIT;
1772 5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	10078 id object = _text_handle(handle);
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10079 char *retval = NULL;
1772 5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	10080
808 c0641a6d4258 Similar fix for dw_window_get_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 807 diff changeset	10081 if([ object isKindOfClass:[ NSWindow class ] ] \|\| [ object isKindOfClass:[ NSButton class ] ])
c0641a6d4258 Similar fix for dw_window_get_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 807 diff changeset	10082 {
1772 5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	10083 id window = object;
808 c0641a6d4258 Similar fix for dw_window_get_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 807 diff changeset	10084 NSString *nsstr = [ window title];
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	10085
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10086 retval = strdup([ nsstr UTF8String ]);
808 c0641a6d4258 Similar fix for dw_window_get_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 807 diff changeset	10087 }
c0641a6d4258 Similar fix for dw_window_get_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 807 diff changeset	10088 else if([ object isKindOfClass:[ NSControl class ] ])
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10089 {
1772 5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	10090 NSControl *control = object;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10091 NSString *nsstr = [ control stringValue];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10092
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10093 retval = strdup([ nsstr UTF8String ]);
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10094 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10095 DW_FUNCTION_RETURN_THIS(retval);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10096 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10097
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10098 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10099 * Sets the text used for a given window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10100 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10101 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10102 * text: The text associsated with a given window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10103 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	10104 DW_FUNCTION_DEFINITION(dw_window_set_text, void, HWND handle, const char *text)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10105 DW_FUNCTION_ADD_PARAM2(handle, text)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10106 DW_FUNCTION_NO_RETURN(dw_window_set_text)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10107 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, text, char *)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10108 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10109 DW_FUNCTION_INIT;
1772 5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	10110 id object = _text_handle(handle);
5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	10111
807 f7016a38bedd Fix for dw_window_set_text() on buttons not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 806 diff changeset	10112 if([ object isKindOfClass:[ NSWindow class ] ] \|\| [ object isKindOfClass:[ NSButton class ] ])
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	10113 [object setTitle:[ NSString stringWithUTF8String:text ]];
807 f7016a38bedd Fix for dw_window_set_text() on buttons not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 806 diff changeset	10114 else if([ object isKindOfClass:[ NSControl class ] ])
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10115 {
1772 5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	10116 NSControl *control = object;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10117 [control setStringValue:[ NSString stringWithUTF8String:text ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10118 }
953 2dfc06afc7d3 Support dw_window_set_text() for groupboxes mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 952 diff changeset	10119 else if([object isMemberOfClass:[DWGroupBox class]])
2dfc06afc7d3 Support dw_window_set_text() for groupboxes mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 952 diff changeset	10120 {
1772 5e16351b01d2 Experimental change to use NSBox to draw border of status text widgets on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1771 diff changeset	10121 DWGroupBox *groupbox = object;
953 2dfc06afc7d3 Support dw_window_set_text() for groupboxes mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 952 diff changeset	10122 [groupbox setTitle:[NSString stringWithUTF8String:text]];
2dfc06afc7d3 Support dw_window_set_text() for groupboxes mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 952 diff changeset	10123 }
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	10124 else
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	10125 return;
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	10126 /* If we changed the text... */
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	10127 Item *item = _box_item(handle);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10128
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	10129 /* Check to see if any of the sizes need to be recalculated */
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	10130 if(item && (item->origwidth == -1 \|\| item->origheight == -1))
1422 131bedf41332 Initial support for automatic redrawing on Windows and ranged/bitmap auto-calculation support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1421 diff changeset	10131 {
1792 b0bdec1b820c Similar fixes to the Mac one on OS/2 and Windows.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1791 diff changeset	10132 int newwidth, newheight;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10133
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10134 _control_size(handle, &newwidth, &newheight);
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10135
1792 b0bdec1b820c Similar fixes to the Mac one on OS/2 and Windows.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1791 diff changeset	10136 /* Only update the item and redraw the window if it changed */
b0bdec1b820c Similar fixes to the Mac one on OS/2 and Windows.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1791 diff changeset	10137 if((item->origwidth == -1 && item->width != newwidth) \|\|
b0bdec1b820c Similar fixes to the Mac one on OS/2 and Windows.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1791 diff changeset	10138 (item->origheight == -1 && item->height != newheight))
b0bdec1b820c Similar fixes to the Mac one on OS/2 and Windows.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1791 diff changeset	10139 {
b0bdec1b820c Similar fixes to the Mac one on OS/2 and Windows.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1791 diff changeset	10140 if(item->origwidth == -1)
b0bdec1b820c Similar fixes to the Mac one on OS/2 and Windows.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1791 diff changeset	10141 item->width = newwidth;
b0bdec1b820c Similar fixes to the Mac one on OS/2 and Windows.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1791 diff changeset	10142 if(item->origheight == -1)
b0bdec1b820c Similar fixes to the Mac one on OS/2 and Windows.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1791 diff changeset	10143 item->height = newheight;
b0bdec1b820c Similar fixes to the Mac one on OS/2 and Windows.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1791 diff changeset	10144 /* Queue a redraw on the top-level window */
b0bdec1b820c Similar fixes to the Mac one on OS/2 and Windows.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1791 diff changeset	10145 _dw_redraw([object window], TRUE);
b0bdec1b820c Similar fixes to the Mac one on OS/2 and Windows.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1791 diff changeset	10146 }
1422 131bedf41332 Initial support for automatic redrawing on Windows and ranged/bitmap auto-calculation support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1421 diff changeset	10147 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10148 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10149 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10150
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10151 /*
1389 0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1385 diff changeset	10152 * Sets the text used for a given window's floating bubble help.
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1385 diff changeset	10153 * Parameters:
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1385 diff changeset	10154 * handle: Handle to the window (widget).
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1385 diff changeset	10155 * bubbletext: The text in the floating bubble tooltip.
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1385 diff changeset	10156 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	10157 DW_FUNCTION_DEFINITION(dw_window_set_tooltip, void, HWND handle, const char *bubbletext)
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10158 DW_FUNCTION_ADD_PARAM2(handle, bubbletext)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10159 DW_FUNCTION_NO_RETURN(dw_window_set_tooltip)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10160 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, bubbletext, char *)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10161 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10162 DW_FUNCTION_INIT;
1389 0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1385 diff changeset	10163 id object = handle;
1400 ccd383e11ff8 Allow removing of tooltips by passing NULL or "" and prevent double tooltips on some platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1396 diff changeset	10164 if(bubbletext && *bubbletext)
ccd383e11ff8 Allow removing of tooltips by passing NULL or "" and prevent double tooltips on some platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1396 diff changeset	10165 [object setToolTip:[NSString stringWithUTF8String:bubbletext]];
ccd383e11ff8 Allow removing of tooltips by passing NULL or "" and prevent double tooltips on some platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1396 diff changeset	10166 else
ccd383e11ff8 Allow removing of tooltips by passing NULL or "" and prevent double tooltips on some platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1396 diff changeset	10167 [object setToolTip:nil];
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10168 DW_FUNCTION_RETURN_NOTHING;
1389 0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1385 diff changeset	10169 }
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1385 diff changeset	10170
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1385 diff changeset	10171 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10172 * Disables given window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10173 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10174 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10175 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10176 DW_FUNCTION_DEFINITION(dw_window_disable, void, HWND handle)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10177 DW_FUNCTION_ADD_PARAM1(handle)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10178 DW_FUNCTION_NO_RETURN(dw_window_disable)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10179 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10180 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10181 DW_FUNCTION_INIT;
800 e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	10182 id object = handle;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	10183
800 e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	10184 if([object isMemberOfClass:[NSScrollView class]])
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	10185 {
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	10186 NSScrollView *sv = handle;
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	10187 object = [sv documentView];
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	10188 }
1277 107e38a29eeb Allow dw_window_enable/disable() to work on menu items on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1275 diff changeset	10189 if([object isKindOfClass:[NSControl class]] \|\| [object isKindOfClass:[NSMenuItem class]])
107e38a29eeb Allow dw_window_enable/disable() to work on menu items on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1275 diff changeset	10190 {
107e38a29eeb Allow dw_window_enable/disable() to work on menu items on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1275 diff changeset	10191 [object setEnabled:NO];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10192 }
800 e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	10193 if([object isKindOfClass:[NSTextView class]])
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	10194 {
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	10195 NSTextView *mle = object;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	10196
800 e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	10197 [mle setEditable:NO];
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	10198 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10199 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10200 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10201
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10202 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10203 * Enables given window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10204 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10205 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10206 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10207 DW_FUNCTION_DEFINITION(dw_window_enable, void, HWND handle)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10208 DW_FUNCTION_ADD_PARAM1(handle)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10209 DW_FUNCTION_NO_RETURN(dw_window_enable)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10210 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10211 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10212 DW_FUNCTION_INIT;
800 e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	10213 id object = handle;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	10214
800 e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	10215 if([object isMemberOfClass:[NSScrollView class]])
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	10216 {
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	10217 NSScrollView *sv = handle;
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	10218 object = [sv documentView];
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	10219 }
1277 107e38a29eeb Allow dw_window_enable/disable() to work on menu items on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1275 diff changeset	10220 if([object isKindOfClass:[NSControl class]] \|\| [object isKindOfClass:[NSMenuItem class]])
107e38a29eeb Allow dw_window_enable/disable() to work on menu items on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1275 diff changeset	10221 {
107e38a29eeb Allow dw_window_enable/disable() to work on menu items on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1275 diff changeset	10222 [object setEnabled:YES];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10223 }
800 e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	10224 if([object isKindOfClass:[NSTextView class]])
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	10225 {
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	10226 NSTextView *mle = object;
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	10227
800 e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	10228 [mle setEditable:YES];
e5a0a1a3ee03 dw_window_enable() and dw_window_disable() now function as expected on MLE controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 799 diff changeset	10229 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10230 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10231 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10232
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10233 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10234 * Sets the bitmap used for a given static window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10235 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10236 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10237 * id: An ID to be used to specify the icon,
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10238 * (pass 0 if you use the filename param)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10239 * filename: a path to a file (Bitmap on OS/2 or
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10240 * Windows and a pixmap on Unix, pass
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10241 * NULL if you use the id param)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10242 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	10243 void API dw_window_set_bitmap_from_data(HWND handle, unsigned long cid, const char *data, int len)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10244 {
1821 69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10245 id object = handle;
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	10246
1821 69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10247 if([ object isKindOfClass:[ NSImageView class ] ] \|\| [ object isKindOfClass:[ NSButton class ]])
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10248 {
1719 032c3388dda6 Fix dw_window_set_bitmap_from_data() not using the resource ID if data is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1713 diff changeset	10249 if(data)
032c3388dda6 Fix dw_window_set_bitmap_from_data() not using the resource ID if data is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1713 diff changeset	10250 {
032c3388dda6 Fix dw_window_set_bitmap_from_data() not using the resource ID if data is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1713 diff changeset	10251 DW_LOCAL_POOL_IN;
032c3388dda6 Fix dw_window_set_bitmap_from_data() not using the resource ID if data is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1713 diff changeset	10252 NSData *thisdata = [NSData dataWithBytes:data length:len];
1821 69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10253 NSImage *pixmap = [[[NSImage alloc] initWithData:thisdata] autorelease];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10254
1719 032c3388dda6 Fix dw_window_set_bitmap_from_data() not using the resource ID if data is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1713 diff changeset	10255 if(pixmap)
032c3388dda6 Fix dw_window_set_bitmap_from_data() not using the resource ID if data is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1713 diff changeset	10256 {
1821 69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10257 [object setImage:pixmap];
69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10258 }
69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10259 /* If we changed the bitmap... */
1719 032c3388dda6 Fix dw_window_set_bitmap_from_data() not using the resource ID if data is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1713 diff changeset	10260 Item *item = _box_item(handle);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10261
1719 032c3388dda6 Fix dw_window_set_bitmap_from_data() not using the resource ID if data is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1713 diff changeset	10262 /* Check to see if any of the sizes need to be recalculated */
032c3388dda6 Fix dw_window_set_bitmap_from_data() not using the resource ID if data is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1713 diff changeset	10263 if(item && (item->origwidth == -1 \|\| item->origheight == -1))
032c3388dda6 Fix dw_window_set_bitmap_from_data() not using the resource ID if data is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1713 diff changeset	10264 {
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10265 _control_size(handle, item->origwidth == -1 ? &item->width : NULL, item->origheight == -1 ? &item->height : NULL);
1719 032c3388dda6 Fix dw_window_set_bitmap_from_data() not using the resource ID if data is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1713 diff changeset	10266 /* Queue a redraw on the top-level window */
1821 69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10267 _dw_redraw([object window], TRUE);
1719 032c3388dda6 Fix dw_window_set_bitmap_from_data() not using the resource ID if data is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1713 diff changeset	10268 }
032c3388dda6 Fix dw_window_set_bitmap_from_data() not using the resource ID if data is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1713 diff changeset	10269 DW_LOCAL_POOL_OUT;
032c3388dda6 Fix dw_window_set_bitmap_from_data() not using the resource ID if data is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1713 diff changeset	10270 }
032c3388dda6 Fix dw_window_set_bitmap_from_data() not using the resource ID if data is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1713 diff changeset	10271 else
032c3388dda6 Fix dw_window_set_bitmap_from_data() not using the resource ID if data is NULL. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1713 diff changeset	10272 dw_window_set_bitmap(handle, cid, NULL);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10273 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10274 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10275
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10276 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10277 * Sets the bitmap used for a given static window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10278 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10279 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10280 * id: An ID to be used to specify the icon,
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10281 * (pass 0 if you use the filename param)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10282 * filename: a path to a file (Bitmap on OS/2 or
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10283 * Windows and a pixmap on Unix, pass
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10284 * NULL if you use the id param)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10285 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	10286 void API dw_window_set_bitmap(HWND handle, unsigned long resid, const char *filename)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10287 {
1821 69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10288 id object = handle;
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	10289 DW_LOCAL_POOL_IN;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10290
1821 69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10291 if([ object isKindOfClass:[ NSImageView class ] ] \|\| [ object isKindOfClass:[ NSButton class ]])
69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10292 {
745 d29fb0d5b291 Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 744 diff changeset	10293 NSImage *bitmap = nil;
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	10294
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	10295 if(filename)
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	10296 {
1821 69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10297 char *ext = _dw_get_image_extension( filename );
69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10298 NSString *nstr = [ NSString stringWithUTF8String:filename ];
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	10299
1821 69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10300 bitmap = [[[NSImage alloc] initWithContentsOfFile:nstr] autorelease];
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	10301
1821 69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10302 if(!bitmap && ext)
69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10303 {
69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10304 nstr = [nstr stringByAppendingString: [NSString stringWithUTF8String:ext]];
69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10305 bitmap = [[[NSImage alloc] initWithContentsOfFile:nstr] autorelease];
69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10306 }
69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10307 }
69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10308 if(!bitmap && resid > 0 && resid < 65536)
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	10309 {
1713 c836c6c33d8e Create an internal _dw_icon_load() which does not resize the image on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1712 diff changeset	10310 bitmap = _dw_icon_load(resid);
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	10311 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10312
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	10313 if(bitmap)
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	10314 {
1821 69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10315 [object setImage:bitmap];
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	10316
1821 69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10317 /* If we changed the bitmap... */
69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10318 Item *item = _box_item(handle);
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	10319
1821 69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10320 /* Check to see if any of the sizes need to be recalculated */
69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10321 if(item && (item->origwidth == -1 \|\| item->origheight == -1))
69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10322 {
69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10323 _control_size(handle, item->origwidth == -1 ? &item->width : NULL, item->origheight == -1 ? &item->height : NULL);
69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10324 /* Queue a redraw on the top-level window */
69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10325 _dw_redraw([object window], TRUE);
69f9aa1e1b1e Added bitmap button support to dw_window_set_bitmap() and added missing extention handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1819 diff changeset	10326 }
675 48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	10327 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10328 }
1580 a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	10329 DW_LOCAL_POOL_OUT;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10330 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10331
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10332 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10333 * Sets the icon used for a given window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10334 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10335 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10336 * id: An ID to be used to specify the icon.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10337 */
672 388f2a48aaae Missed one function to typedef. Fixed errors in the test program and switched to using bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 671 diff changeset	10338 void API dw_window_set_icon(HWND handle, HICN icon)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10339 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10340 /* This isn't needed, it is loaded from the bundle */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10341 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10342
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10343 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10344 * Gets the child window handle with specified ID.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10345 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10346 * handle: Handle to the parent window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10347 * id: Integer ID of the child.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10348 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	10349 HWND API dw_window_from_id(HWND handle, int cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10350 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10351 NSObject *object = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10352 NSView *view = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10353 if([ object isKindOfClass:[ NSWindow class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10354 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10355 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10356 view = [window contentView];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10357 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10358 return [view viewWithTag:cid];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10359 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10360
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10361 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10362 * Minimizes or Iconifies a top-level window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10363 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10364 * handle: The window handle to minimize.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10365 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10366 int API dw_window_minimize(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10367 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10368 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10369 [window miniaturize:nil];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10370 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10371 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10372
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10373 /* Causes entire window to be invalidated and redrawn.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10374 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10375 * handle: Toplevel window handle to be redrawn.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10376 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10377 void API dw_window_redraw(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10378 {
1101 d7eafaa054ab Added support for dw_window_redraw() causing splitbar panes to redraw without bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1100 diff changeset	10379 DWWindow *window = handle;
d7eafaa054ab Added support for dw_window_redraw() causing splitbar panes to redraw without bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1100 diff changeset	10380 [window setRedraw:YES];
941 18f194e1d71d dw_window_redraw() should relayout the window in addition to flushing the buffer on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 940 diff changeset	10381 [[window contentView] showWindow];
1941 b498fb0360fc Mac: 10.14 seems to have drastically changed the drawing mechanism. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1940 diff changeset	10382 #ifndef BUILDING_FOR_MOJAVE
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10383 [window flushWindow];
1941 b498fb0360fc Mac: 10.14 seems to have drastically changed the drawing mechanism. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1940 diff changeset	10384 #endif
1101 d7eafaa054ab Added support for dw_window_redraw() causing splitbar panes to redraw without bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1100 diff changeset	10385 [window setRedraw:NO];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10386 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10387
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10388 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10389 * Makes the window topmost.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10390 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10391 * handle: The window handle to make topmost.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10392 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10393 int API dw_window_raise(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10394 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10395 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10396 [window orderFront:nil];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10397 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10398 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10399
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10400 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10401 * Makes the window bottommost.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10402 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10403 * handle: The window handle to make bottommost.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10404 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10405 int API dw_window_lower(HWND handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10406 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10407 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10408 [window orderBack:nil];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10409 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10410 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10411
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10412 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10413 * Sets the size of a given window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10414 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10415 * handle: Window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10416 * width: New width in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10417 * height: New height in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10418 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10419 DW_FUNCTION_DEFINITION(dw_window_set_size, void, HWND handle, ULONG width, ULONG height)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10420 DW_FUNCTION_ADD_PARAM3(handle, width, height)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10421 DW_FUNCTION_NO_RETURN(dw_window_set_size)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10422 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, width, ULONG, height, ULONG)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10423 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10424 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10425 NSObject *object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10426
1494 cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10427 if([ object isMemberOfClass:[ DWWindow class ] ])
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10428 {
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10429 DWWindow *window = handle;
1438 bde7ebced556 Initial layout engine 2.0 for Windows and OS/2...Plus some updates for the Mac code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1437 diff changeset	10430 Box *thisbox;
1478 7216f4301364 Fix mixing frame and content sizes on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1474 diff changeset	10431 NSRect content, frame = NSMakeRect(0, 0, width, height);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10432
1478 7216f4301364 Fix mixing frame and content sizes on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1474 diff changeset	10433 /* Convert the external frame size to internal content size */
7216f4301364 Fix mixing frame and content sizes on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1474 diff changeset	10434 content = [NSWindow contentRectForFrameRect:frame styleMask:[window styleMask]];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10435
1438 bde7ebced556 Initial layout engine 2.0 for Windows and OS/2...Plus some updates for the Mac code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1437 diff changeset	10436 /*
bde7ebced556 Initial layout engine 2.0 for Windows and OS/2...Plus some updates for the Mac code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1437 diff changeset	10437 * The following is an attempt to dynamically size a window based on the size of its
bde7ebced556 Initial layout engine 2.0 for Windows and OS/2...Plus some updates for the Mac code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1437 diff changeset	10438 * children before realization. Only applicable when width or height is less than one.
bde7ebced556 Initial layout engine 2.0 for Windows and OS/2...Plus some updates for the Mac code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1437 diff changeset	10439 */
1906 fac81560eb09 Fix a number of warning generated by the new bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1905 diff changeset	10440 if((width < 1 \|\| height < 1) && (thisbox = (Box *)[[window contentView] box]))
1438 bde7ebced556 Initial layout engine 2.0 for Windows and OS/2...Plus some updates for the Mac code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1437 diff changeset	10441 {
bde7ebced556 Initial layout engine 2.0 for Windows and OS/2...Plus some updates for the Mac code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1437 diff changeset	10442 int depth = 0;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10443
1438 bde7ebced556 Initial layout engine 2.0 for Windows and OS/2...Plus some updates for the Mac code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1437 diff changeset	10444 /* Calculate space requirements */
1446 0d4fdf646caf Fix clang integer conversion warning on 64bit Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1442 diff changeset	10445 _resize_box(thisbox, &depth, (int)width, (int)height, 1);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10446
1531 783a464afab2 Added window and box support to dw_window_get_preferred_size() on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1530 diff changeset	10447 /* Update components that need auto-sizing */
1478 7216f4301364 Fix mixing frame and content sizes on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1474 diff changeset	10448 if(width < 1) content.size.width = thisbox->minwidth;
7216f4301364 Fix mixing frame and content sizes on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1474 diff changeset	10449 if(height < 1) content.size.height = thisbox->minheight;
1438 bde7ebced556 Initial layout engine 2.0 for Windows and OS/2...Plus some updates for the Mac code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1437 diff changeset	10450 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10451
1438 bde7ebced556 Initial layout engine 2.0 for Windows and OS/2...Plus some updates for the Mac code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1437 diff changeset	10452 /* Finally set the size */
1478 7216f4301364 Fix mixing frame and content sizes on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1474 diff changeset	10453 [window setContentSize:content.size];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10454 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10455 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10456 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10457
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10458 /*
1429 fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1425 diff changeset	10459 * Gets the size the system thinks the widget should be.
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1425 diff changeset	10460 * Parameters:
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1425 diff changeset	10461 * handle: Window handle of the item to be back.
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1425 diff changeset	10462 * width: Width in pixels of the item or NULL if not needed.
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1425 diff changeset	10463 * height: Height in pixels of the item or NULL if not needed.
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1425 diff changeset	10464 */
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1425 diff changeset	10465 void API dw_window_get_preferred_size(HWND handle, int width, int height)
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1425 diff changeset	10466 {
1530 eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10467 id object = handle;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10468
1530 eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10469 if([object isMemberOfClass:[DWWindow class]])
eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10470 {
eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10471 Box *thisbox;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10472
1906 fac81560eb09 Fix a number of warning generated by the new bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1905 diff changeset	10473 if((thisbox = (Box *)[[object contentView] box]))
1530 eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10474 {
eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10475 int depth = 0;
eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10476 NSRect frame;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10477
1530 eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10478 /* Calculate space requirements */
eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10479 _resize_box(thisbox, &depth, 0, 0, 1);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10480
1531 783a464afab2 Added window and box support to dw_window_get_preferred_size() on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1530 diff changeset	10481 /* Figure out the border size */
1530 eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10482 frame = [NSWindow frameRectForContentRect:NSMakeRect(0, 0, thisbox->minwidth, thisbox->minheight) styleMask:[object styleMask]];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10483
1531 783a464afab2 Added window and box support to dw_window_get_preferred_size() on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1530 diff changeset	10484 /* Return what was requested */
1530 eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10485 if(width) *width = frame.size.width;
eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10486 if(height) *height = frame.size.height;
eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10487 }
eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10488 }
eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10489 else if([object isMemberOfClass:[DWBox class]])
eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10490 {
eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10491 Box *thisbox;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10492
1906 fac81560eb09 Fix a number of warning generated by the new bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1905 diff changeset	10493 if((thisbox = (Box *)[object box]))
1530 eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10494 {
eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10495 int depth = 0;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10496
1530 eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10497 /* Calculate space requirements */
eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10498 _resize_box(thisbox, &depth, 0, 0, 1);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10499
1531 783a464afab2 Added window and box support to dw_window_get_preferred_size() on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1530 diff changeset	10500 /* Return what was requested */
1530 eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10501 if(width) *width = thisbox->minwidth;
eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10502 if(height) *height = thisbox->minheight;
eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10503 }
eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10504 }
eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10505 else
eecfceaf581f On Mac allow dw_window_get_preferred_size() to work on windows and boxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1529 diff changeset	10506 _control_size(handle, width, height);
1429 fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1425 diff changeset	10507 }
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1425 diff changeset	10508
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1425 diff changeset	10509 /*
1474 cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10510 * Sets the gravity of a given window (widget).
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10511 * Gravity controls which corner of the screen and window the position is relative to.
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10512 * Parameters:
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10513 * handle: Window (widget) handle.
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10514 * horz: DW_GRAV_LEFT (default), DW_GRAV_RIGHT or DW_GRAV_CENTER.
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10515 * vert: DW_GRAV_TOP (default), DW_GRAV_BOTTOM or DW_GRAV_CENTER.
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10516 */
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10517 void API dw_window_set_gravity(HWND handle, int horz, int vert)
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10518 {
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10519 dw_window_set_data(handle, "_dw_grav_horz", DW_INT_TO_POINTER(horz));
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10520 dw_window_set_data(handle, "_dw_grav_vert", DW_INT_TO_POINTER(vert));
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10521 }
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10522
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10523 /* Convert the coordinates based on gravity */
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10524 void _handle_gravity(HWND handle, long x, long y, unsigned long width, unsigned long height)
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10525 {
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10526 int horz = DW_POINTER_TO_INT(dw_window_get_data(handle, "_dw_grav_horz"));
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10527 int vert = DW_POINTER_TO_INT(dw_window_get_data(handle, "_dw_grav_vert"));
1513 def1ca619ba2 Use the screen of the window when possible on Mac instead of the main screen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1502 diff changeset	10528 id object = handle;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10529
1474 cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10530 /* Do any gravity calculations */
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10531 if(horz \|\| (vert & 0xf) != DW_GRAV_BOTTOM)
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10532 {
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10533 long newx = x, newy = y;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10534
1474 cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10535 /* Handle horizontal center gravity */
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10536 if((horz & 0xf) == DW_GRAV_CENTER)
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10537 newx += ((dw_screen_width() / 2) - (width / 2));
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10538 /* Handle right gravity */
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10539 else if((horz & 0xf) == DW_GRAV_RIGHT)
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10540 newx = dw_screen_width() - width - *x;
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10541 /* Handle vertical center gravity */
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10542 if((vert & 0xf) == DW_GRAV_CENTER)
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10543 newy += ((dw_screen_height() / 2) - (height / 2));
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10544 else if((vert & 0xf) == DW_GRAV_TOP)
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10545 newy = dw_screen_height() - height - *y;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10546
1474 cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10547 /* Save the new values */
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10548 *x = newx;
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10549 *y = newy;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10550 }
1492 1608c2a9c2b8 Initial attempt at gravity obstacles on Mac.... doesn't work was trying to debug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1490 diff changeset	10551 /* Adjust the values to avoid Dock/Menubar if requested */
1494 cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10552 if((horz \| vert) & DW_GRAV_OBSTACLES)
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10553 {
1513 def1ca619ba2 Use the screen of the window when possible on Mac instead of the main screen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1502 diff changeset	10554 NSRect visiblerect = [[object screen] visibleFrame];
def1ca619ba2 Use the screen of the window when possible on Mac instead of the main screen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1502 diff changeset	10555 NSRect totalrect = [[object screen] frame];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10556
1494 cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10557 if(horz & DW_GRAV_OBSTACLES)
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10558 {
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10559 if((horz & 0xf) == DW_GRAV_LEFT)
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10560 *x += visiblerect.origin.x;
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10561 else if((horz & 0xf) == DW_GRAV_RIGHT)
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10562 *x -= (totalrect.origin.x + totalrect.size.width) - (visiblerect.origin.x + visiblerect.size.width);
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10563 }
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10564 if(vert & DW_GRAV_OBSTACLES)
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10565 {
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10566 if((vert & 0xf) == DW_GRAV_BOTTOM)
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10567 *y += visiblerect.origin.y;
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10568 else if((vert & 0xf) == DW_GRAV_TOP)
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10569 *y -= (totalrect.origin.y + totalrect.size.height) - (visiblerect.origin.y + visiblerect.size.height);
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10570 }
1492 1608c2a9c2b8 Initial attempt at gravity obstacles on Mac.... doesn't work was trying to debug bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1490 diff changeset	10571 }
1474 cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10572 }
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10573
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10574 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10575 * Sets the position of a given window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10576 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10577 * handle: Window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10578 * x: X location from the bottom left.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10579 * y: Y location from the bottom left.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10580 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10581 DW_FUNCTION_DEFINITION(dw_window_set_pos, void, HWND handle, LONG x, LONG y)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10582 DW_FUNCTION_ADD_PARAM3(handle, x, y)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10583 DW_FUNCTION_NO_RETURN(dw_window_set_pos)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10584 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, x, LONG, y, LONG)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10585 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10586 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10587 NSObject *object = handle;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10588
1497 99a53823079f On Mac lets just use the shown flag and not worry about the actual window position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1494 diff changeset	10589 if([ object isMemberOfClass:[ DWWindow class ] ])
99a53823079f On Mac lets just use the shown flag and not worry about the actual window position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1494 diff changeset	10590 {
99a53823079f On Mac lets just use the shown flag and not worry about the actual window position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1494 diff changeset	10591 DWWindow *window = handle;
1474 cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10592 NSPoint point;
1498 f8b4d6075cac Added auto-size support during dw_window_set_pos() on OS/2, Mac and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1497 diff changeset	10593 NSSize size = [[window contentView] frame].size;
f8b4d6075cac Added auto-size support during dw_window_set_pos() on OS/2, Mac and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1497 diff changeset	10594
f8b4d6075cac Added auto-size support during dw_window_set_pos() on OS/2, Mac and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1497 diff changeset	10595 /* Can't position an unsized window, so attempt to auto-size */
f8b4d6075cac Added auto-size support during dw_window_set_pos() on OS/2, Mac and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1497 diff changeset	10596 if(size.width <= 1 \|\| size.height <= 1)
f8b4d6075cac Added auto-size support during dw_window_set_pos() on OS/2, Mac and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1497 diff changeset	10597 {
f8b4d6075cac Added auto-size support during dw_window_set_pos() on OS/2, Mac and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1497 diff changeset	10598 /* Determine the contents size */
f8b4d6075cac Added auto-size support during dw_window_set_pos() on OS/2, Mac and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1497 diff changeset	10599 dw_window_set_size(handle, 0, 0);
f8b4d6075cac Added auto-size support during dw_window_set_pos() on OS/2, Mac and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1497 diff changeset	10600 }
f8b4d6075cac Added auto-size support during dw_window_set_pos() on OS/2, Mac and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1497 diff changeset	10601
f8b4d6075cac Added auto-size support during dw_window_set_pos() on OS/2, Mac and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1497 diff changeset	10602 size = [window frame].size;
1474 cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10603 _handle_gravity(handle, &x, &y, (unsigned long)size.width, (unsigned long)size.height);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10604
1474 cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10605 point.x = x;
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10606 point.y = y;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10607
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10608 [window setFrameOrigin:point];
1497 99a53823079f On Mac lets just use the shown flag and not worry about the actual window position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1494 diff changeset	10609 /* Position set manually... don't auto-position */
99a53823079f On Mac lets just use the shown flag and not worry about the actual window position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1494 diff changeset	10610 [window setShown:YES];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10611 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10612 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10613 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10614
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10615 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10616 * Sets the position and size of a given window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10617 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10618 * handle: Window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10619 * x: X location from the bottom left.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10620 * y: Y location from the bottom left.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10621 * width: Width of the widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10622 * height: Height of the widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10623 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10624 void API dw_window_set_pos_size(HWND handle, LONG x, LONG y, ULONG width, ULONG height)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10625 {
947 c9f6ba940453 On window sizes we need to flip the origin point on the frame too on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 946 diff changeset	10626 dw_window_set_size(handle, width, height);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10627 dw_window_set_pos(handle, x, y);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10628 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10629
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10630 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10631 * Gets the position and size of a given window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10632 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10633 * handle: Window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10634 * x: X location from the bottom left.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10635 * y: Y location from the bottom left.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10636 * width: Width of the widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10637 * height: Height of the widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10638 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10639 void API dw_window_get_pos_size(HWND handle, LONG x, LONG y, ULONG width, ULONG height)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10640 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10641 NSObject *object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10642
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10643 if([ object isKindOfClass:[ NSWindow class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10644 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10645 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10646 NSRect rect = [window frame];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10647 if(x)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10648 *x = rect.origin.x;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10649 if(y)
1513 def1ca619ba2 Use the screen of the window when possible on Mac instead of the main screen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1502 diff changeset	10650 *y = [[window screen] frame].size.height - rect.origin.y - rect.size.height;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10651 if(width)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10652 *width = rect.size.width;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10653 if(height)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10654 *height = rect.size.height;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10655 return;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10656 }
951 7193401d139a Added support for dw_window_get_pos_size() to work on individual controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 950 diff changeset	10657 else if([ object isKindOfClass:[ NSControl class ] ])
7193401d139a Added support for dw_window_get_pos_size() to work on individual controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 950 diff changeset	10658 {
7193401d139a Added support for dw_window_get_pos_size() to work on individual controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 950 diff changeset	10659 NSControl *control = handle;
7193401d139a Added support for dw_window_get_pos_size() to work on individual controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 950 diff changeset	10660 NSRect rect = [control frame];
7193401d139a Added support for dw_window_get_pos_size() to work on individual controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 950 diff changeset	10661 if(x)
7193401d139a Added support for dw_window_get_pos_size() to work on individual controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 950 diff changeset	10662 *x = rect.origin.x;
7193401d139a Added support for dw_window_get_pos_size() to work on individual controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 950 diff changeset	10663 if(y)
7193401d139a Added support for dw_window_get_pos_size() to work on individual controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 950 diff changeset	10664 *y = rect.origin.y;
7193401d139a Added support for dw_window_get_pos_size() to work on individual controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 950 diff changeset	10665 if(width)
7193401d139a Added support for dw_window_get_pos_size() to work on individual controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 950 diff changeset	10666 *width = rect.size.width;
7193401d139a Added support for dw_window_get_pos_size() to work on individual controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 950 diff changeset	10667 if(height)
7193401d139a Added support for dw_window_get_pos_size() to work on individual controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 950 diff changeset	10668 *height = rect.size.height;
7193401d139a Added support for dw_window_get_pos_size() to work on individual controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 950 diff changeset	10669 return;
7193401d139a Added support for dw_window_get_pos_size() to work on individual controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 950 diff changeset	10670 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10671 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10672
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10673 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10674 * Returns the width of the screen.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10675 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10676 int API dw_screen_width(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10677 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10678 NSRect screenRect = [[NSScreen mainScreen] frame];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10679 return screenRect.size.width;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10680 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10681
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10682 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10683 * Returns the height of the screen.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10684 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10685 int API dw_screen_height(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10686 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10687 NSRect screenRect = [[NSScreen mainScreen] frame];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10688 return screenRect.size.height;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10689 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10690
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10691 /* This should return the current color depth */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10692 unsigned long API dw_color_depth_get(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10693 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10694 NSWindowDepth screenDepth = [[NSScreen mainScreen] depth];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10695 return NSBitsPerPixelFromDepth(screenDepth);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10696 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10697
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10698 /*
2067 3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10699 * Creates a new system notification if possible.
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10700 * Parameters:
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10701 * title: The short title of the notification.
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10702 * pixmap: Handle to an image to display or NULL if none.
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10703 * description: A longer description of the notification,
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10704 * or NULL if none is necessary.
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10705 * Returns:
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10706 * A handle to the notification which can be used to attach a "clicked" event if desired,
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10707 * or NULL if it fails or notifications are not supported by the system.
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10708 * Remarks:
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10709 * This will create a system notification that will show in the notifaction panel
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10710 * on supported systems, which may be clicked to perform another task.
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10711 */
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10712 HWND dw_notification_new(const char title, HPIXMAP pixmap, const char description, ...)
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10713 {
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10714 #ifdef BUILDING_FOR_MOUNTAIN_LION
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10715 char outbuf[1025] = {0};
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10716 HWND retval = NULL;
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10717
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10718 if(description)
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10719 {
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10720 va_list args;
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10721
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10722 va_start(args, description);
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10723 vsnprintf(outbuf, 1024, description, args);
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10724 va_end(args);
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10725 }
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10726
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10727 #ifdef BUILDING_FOR_MOJAVE
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10728 // Configure the notification's payload.
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10729 if (@available(macOS 10.14, *))
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10730 {
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10731 UNMutableNotificationContent* notification = [[UNMutableNotificationContent alloc] init];
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10732
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10733 if(notification)
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10734 {
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10735 notification.title = [NSString stringWithUTF8String:title];
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10736 if(description)
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10737 notification.body = [NSString stringWithUTF8String:outbuf];
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10738 retval = notification;
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10739 }
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10740 }
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10741 else
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10742 #endif
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10743 {
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10744 // Fallback on earlier versions
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10745 NSUserNotification *notification = [[NSUserNotification alloc] init];
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10746
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10747 if(notification)
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10748 {
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10749 notification.title = [NSString stringWithUTF8String:title];
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10750 notification.informativeText = [NSString stringWithUTF8String:outbuf];
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10751 if(pixmap && pixmap->image)
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10752 notification.contentImage = pixmap->image;
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10753 retval = notification;
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10754 }
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10755 }
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10756 return retval;
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10757 #else
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10758 return NULL;
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10759 #endif
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10760 }
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10761
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10762 /*
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10763 * Sends a notification created by dw_notification_new() after attaching signal handler.
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10764 * Parameters:
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10765 * notification: The handle to the notification returned by dw_notification_new().
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10766 * Returns:
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10767 * DW_ERROR_NONE on success, DW_ERROR_UNKNOWN on error or not supported.
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10768 */
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10769 int dw_notification_send(HWND notification)
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10770 {
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10771 #ifdef BUILDING_FOR_MOUNTAIN_LION
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10772 if(notification)
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10773 {
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10774 #ifdef BUILDING_FOR_MOJAVE
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10775 // Schedule the notification.
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10776 if (@available(macOS 10.14, *))
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10777 {
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10778 UNMutableNotificationContent content = (UNMutableNotificationContent )notification;
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10779 NSString *notid = [NSString stringWithFormat:@"dw-notification-%llu", (unsigned long long)notification];
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10780 UNNotificationRequest* request = [UNNotificationRequest requestWithIdentifier:notid
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10781 content:content trigger:nil];
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10782
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10783 UNUserNotificationCenter* center = [UNUserNotificationCenter currentNotificationCenter];
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10784 [center addNotificationRequest:request withCompletionHandler:^(NSError * _Nullable error) {
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10785 _event_handler(notification, nil, 8);
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10786 }];
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10787 }
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10788 else
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10789 #endif
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10790 {
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10791 // Fallback on earlier versions
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10792 [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:notification];
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10793 }
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10794 return DW_ERROR_NONE;
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10795 }
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10796 #endif
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10797 return DW_ERROR_UNKNOWN;
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10798 }
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10799
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10800
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	10801 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10802 * Returns some information about the current operating environment.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10803 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10804 * env: Pointer to a DWEnv struct.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10805 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10806 void dw_environment_query(DWEnv *env)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10807 {
2064 19fb7f72051b Mac: Minor update to dw_environment_query(). Improve safety and remove unused code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2037 diff changeset	10808 memset(env, '\0', sizeof(DWEnv));
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10809 strcpy(env->osName, "MacOS");
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10810
2064 19fb7f72051b Mac: Minor update to dw_environment_query(). Improve safety and remove unused code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2037 diff changeset	10811 strncpy(env->buildDate, __DATE__, sizeof(env->buildDate)-1);
19fb7f72051b Mac: Minor update to dw_environment_query(). Improve safety and remove unused code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2037 diff changeset	10812 strncpy(env->buildTime, __TIME__, sizeof(env->buildTime)-1);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10813 env->DWMajorVersion = DW_MAJOR_VERSION;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10814 env->DWMinorVersion = DW_MINOR_VERSION;
1160 924c8087a755 Attempt to use the subversion revision number as the sub version number. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1158 diff changeset	10815 #ifdef VER_REV
924c8087a755 Attempt to use the subversion revision number as the sub version number. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1158 diff changeset	10816 env->DWSubVersion = VER_REV;
924c8087a755 Attempt to use the subversion revision number as the sub version number. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1158 diff changeset	10817 #else
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10818 env->DWSubVersion = DW_SUB_VERSION;
1160 924c8087a755 Attempt to use the subversion revision number as the sub version number. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1158 diff changeset	10819 #endif
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10820
751 eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	10821 env->MajorVersion = DWOSMajor;
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	10822 env->MinorVersion = DWOSMinor;
eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	10823 env->MajorBuild = DWOSBuild;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10824 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10825
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10826 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10827 * Emits a beep.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10828 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10829 * freq: Frequency.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10830 * dur: Duration.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10831 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10832 void API dw_beep(int freq, int dur)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10833 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10834 NSBeep();
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10835 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10836
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10837 /* Call this after drawing to the screen to make sure
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10838 * anything you have drawn is visible.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10839 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10840 void API dw_flush(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10841 {
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	10842 /* This may need to be thread specific */
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	10843 [DWObj performSelectorOnMainThread:@selector(doFlush:) withObject:nil waitUntilDone:NO];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10844 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10845
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10846 /* Functions for managing the user data lists that are associated with
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10847 * a given window handle. Used in dw_window_set_data() and
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10848 * dw_window_get_data().
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10849 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	10850 UserData _find_userdata(UserData root, const char varname)
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10851 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10852 UserData tmp = root;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10853
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10854 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10855 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10856 if(strcasecmp(tmp->varname, varname) == 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10857 return tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10858 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10859 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10860 return NULL;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10861 }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10862
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	10863 int _new_userdata(UserData *root, const char varname, void *data)
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10864 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10865 UserData *new = _find_userdata(root, varname);
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10866
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10867 if(new)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10868 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10869 new->data = data;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10870 return TRUE;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10871 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10872 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10873 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10874 new = malloc(sizeof(UserData));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10875 if(new)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10876 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10877 new->varname = strdup(varname);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10878 new->data = data;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10879
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10880 new->next = NULL;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10881
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10882 if (!*root)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10883 *root = new;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10884 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10885 {
1303 ca02c24e80c9 Experimental change to menu code on Windows to allow dw_window_enable/disable to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1302 diff changeset	10886 UserData prev = root, *tmp = prev->next;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10887
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10888 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10889 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10890 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10891 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10892 }
1303 ca02c24e80c9 Experimental change to menu code on Windows to allow dw_window_enable/disable to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1302 diff changeset	10893 prev->next = new;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10894 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10895 return TRUE;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10896 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10897 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10898 return FALSE;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10899 }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10900
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	10901 int _remove_userdata(UserData *root, const char varname, int all)
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10902 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10903 UserData prev = NULL, tmp = *root;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10904
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10905 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10906 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10907 if(all \|\| strcasecmp(tmp->varname, varname) == 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10908 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10909 if(!prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10910 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10911 *root = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10912 free(tmp->varname);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10913 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10914 if(!all)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10915 return 0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10916 tmp = *root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10917 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10918 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10919 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10920 /* If all is true we should
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10921 * never get here.
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10922 */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10923 prev->next = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10924 free(tmp->varname);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10925 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10926 return 0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10927 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10928 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10929 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10930 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10931 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10932 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10933 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10934 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10935 return 0;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10936 }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10937
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10938 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10939 * Add a named user data item to a window handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10940 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10941 * window: Window handle of signal to be called back.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10942 * dataname: A string pointer identifying which signal to be hooked.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10943 * data: User data to be passed to the handler function.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10944 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	10945 void dw_window_set_data(HWND window, const char dataname, void data)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10946 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10947 id object = window;
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	10948 if([object isMemberOfClass:[DWWindow class]])
681 5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	10949 {
5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	10950 NSWindow *win = window;
5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	10951 object = [win contentView];
5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	10952 }
5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	10953 else if([object isMemberOfClass:[NSScrollView class]])
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	10954 {
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	10955 NSScrollView *sv = window;
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	10956 object = [sv documentView];
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	10957 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10958 WindowData blah = (WindowData )[object userdata];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10959
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10960 if(!blah)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10961 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10962 if(!dataname)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10963 return;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10964
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10965 blah = calloc(1, sizeof(WindowData));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10966 [object setUserdata:blah];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10967 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10968
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10969 if(data)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10970 _new_userdata(&(blah->root), dataname, data);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10971 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10972 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10973 if(dataname)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10974 _remove_userdata(&(blah->root), dataname, FALSE);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10975 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10976 _remove_userdata(&(blah->root), NULL, TRUE);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10977 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10978 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10979
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10980 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10981 * Gets a named user data item to a window handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10982 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10983 * window: Window handle of signal to be called back.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10984 * dataname: A string pointer identifying which signal to be hooked.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10985 * data: User data to be passed to the handler function.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10986 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	10987 void dw_window_get_data(HWND window, const char dataname)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10988 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10989 id object = window;
894 d1d7e5c51860 Added a DWWindow subclass to trap key events on the main window for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 891 diff changeset	10990 if([object isMemberOfClass:[DWWindow class]])
681 5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	10991 {
5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	10992 NSWindow *win = window;
5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	10993 object = [win contentView];
5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	10994 }
5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	10995 else if([object isMemberOfClass:[NSScrollView class]])
676 9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	10996 {
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	10997 NSScrollView *sv = window;
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	10998 object = [sv documentView];
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	10999 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11000 WindowData blah = (WindowData )[object userdata];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	11001
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11002 if(blah && blah->root && dataname)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11003 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11004 UserData *ud = _find_userdata(&(blah->root), dataname);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11005 if(ud)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11006 return ud->data;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11007 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11008 return NULL;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11009 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11010
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	11011 #define DW_TIMER_MAX 64
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	11012 NSTimer *DWTimers[DW_TIMER_MAX];
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	11013
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11014 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11015 * Add a callback to a timer event.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11016 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11017 * interval: Milliseconds to delay between calls.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11018 * sigfunc: The pointer to the function to be used as the callback.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11019 * data: User data to be passed to the handler function.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11020 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11021 * Timer ID for use with dw_timer_disconnect(), 0 on error.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11022 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11023 int API dw_timer_connect(int interval, void sigfunc, void data)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11024 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11025 int z;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	11026
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11027 for(z=0;z<DW_TIMER_MAX;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11028 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11029 if(!DWTimers[z])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11030 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11031 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11032 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11033 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	11034
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11035 if(sigfunc && !DWTimers[z])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11036 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11037 NSTimeInterval seconds = (double)interval / 1000.0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11038 NSTimer *thistimer = DWTimers[z] = [NSTimer scheduledTimerWithTimeInterval:seconds target:DWHandler selector:@selector(runTimer:) userInfo:nil repeats:YES];
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11039 _new_signal(0, thistimer, z+1, sigfunc, NULL, data);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11040 return z+1;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11041 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11042 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11043 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11044
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11045 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11046 * Removes timer callback.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11047 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11048 * id: Timer ID returned by dw_timer_connect().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11049 */
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	11050 void API dw_timer_disconnect(int timerid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11051 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11052 SignalHandler prev = NULL, tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11053 NSTimer *thistimer;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	11054
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11055 /* 0 is an invalid timer ID */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11056 if(timerid < 1 \|\| !DWTimers[timerid-1])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11057 return;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	11058
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11059 thistimer = DWTimers[timerid-1];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11060 DWTimers[timerid-1] = nil;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	11061
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11062 [thistimer invalidate];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	11063
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11064 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11065 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11066 if(tmp->id == timerid && tmp->window == thistimer)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11067 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11068 if(prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11069 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11070 prev->next = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11071 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11072 tmp = prev->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11073 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11074 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11075 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11076 Root = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11077 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11078 tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11079 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11080 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11081 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11082 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11083 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11084 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11085 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11086 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11087 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11088
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11089 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11090 * Add a callback to a window event.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11091 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11092 * window: Window handle of signal to be called back.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11093 * signame: A string pointer identifying which signal to be hooked.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11094 * sigfunc: The pointer to the function to be used as the callback.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11095 * data: User data to be passed to the handler function.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11096 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	11097 void API dw_signal_connect(HWND window, const char signame, void sigfunc, void *data)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11098 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11099 dw_signal_connect_data(window, signame, sigfunc, NULL, data);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11100 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11101
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11102 /*
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11103 * Add a callback to a window event with a closure callback.
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11104 * Parameters:
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11105 * window: Window handle of signal to be called back.
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11106 * signame: A string pointer identifying which signal to be hooked.
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11107 * sigfunc: The pointer to the function to be used as the callback.
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11108 * discfunc: The pointer to the function called when this handler is removed.
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11109 * data: User data to be passed to the handler function.
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11110 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	11111 void API dw_signal_connect_data(HWND window, const char signame, void sigfunc, void discfunc, void data)
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11112 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11113 ULONG message = 0, msgid = 0;
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	11114
1843 2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	11115 /* Handle special case of application delete signal */
2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	11116 if(!window && signame && strcmp(signame, DW_SIGNAL_DELETE) == 0)
2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	11117 {
2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	11118 window = DWApp;
2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	11119 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11120
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11121 if(window && signame && sigfunc)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11122 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11123 if((message = _findsigmessage(signame)) != 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11124 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11125 _new_signal(message, window, (int)msgid, sigfunc, discfunc, data);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11126 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11127 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11128 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11129
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11130 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11131 * Removes callbacks for a given window with given name.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11132 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11133 * window: Window handle of callback to be removed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11134 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	11135 void API dw_signal_disconnect_by_name(HWND window, const char *signame)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11136 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11137 SignalHandler prev = NULL, tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11138 ULONG message;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	11139
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11140 if(!window \|\| !signame \|\| (message = _findsigmessage(signame)) == 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11141 return;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	11142
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11143 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11144 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11145 if(tmp->window == window && tmp->message == message)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11146 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11147 void (discfunc)(HWND, void ) = tmp->discfunction;
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	11148
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11149 if(discfunc)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11150 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11151 discfunc(tmp->window, tmp->data);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11152 }
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	11153
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11154 if(prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11155 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11156 prev->next = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11157 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11158 tmp = prev->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11159 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11160 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11161 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11162 Root = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11163 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11164 tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11165 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11166 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11167 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11168 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11169 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11170 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11171 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11172 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11173 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11174
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11175 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11176 * Removes all callbacks for a given window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11177 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11178 * window: Window handle of callback to be removed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11179 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11180 void API dw_signal_disconnect_by_window(HWND window)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11181 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11182 SignalHandler prev = NULL, tmp = Root;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	11183
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11184 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11185 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11186 if(tmp->window == window)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11187 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11188 void (discfunc)(HWND, void ) = tmp->discfunction;
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	11189
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11190 if(discfunc)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11191 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11192 discfunc(tmp->window, tmp->data);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11193 }
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	11194
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11195 if(prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11196 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11197 prev->next = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11198 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11199 tmp = prev->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11200 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11201 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11202 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11203 Root = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11204 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11205 tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11206 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11207 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11208 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11209 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11210 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11211 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11212 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11213 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11214 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11215
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11216 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11217 * Removes all callbacks for a given window with specified data.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11218 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11219 * window: Window handle of callback to be removed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11220 * data: Pointer to the data to be compared against.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11221 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11222 void API dw_signal_disconnect_by_data(HWND window, void *data)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11223 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11224 SignalHandler prev = NULL, tmp = Root;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	11225
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11226 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11227 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11228 if(tmp->window == window && tmp->data == data)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11229 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11230 void (discfunc)(HWND, void ) = tmp->discfunction;
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	11231
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11232 if(discfunc)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11233 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11234 discfunc(tmp->window, tmp->data);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11235 }
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	11236
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11237 if(prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11238 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11239 prev->next = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11240 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11241 tmp = prev->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11242 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11243 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11244 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11245 Root = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11246 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11247 tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11248 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11249 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11250 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11251 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11252 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11253 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11254 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11255 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11256 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11257
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11258 void _my_strlwr(char *buf)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11259 {
1110 404b639f096b Minor typecast fixes for warnings reported by clang on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1102 diff changeset	11260 int z, len = (int)strlen(buf);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11261
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11262 for(z=0;z<len;z++)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11263 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11264 if(buf[z] >= 'A' && buf[z] <= 'Z')
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11265 buf[z] -= 'A' - 'a';
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11266 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11267 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11268
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11269 /* Open a shared library and return a handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11270 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11271 * name: Base name of the shared library.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11272 * handle: Pointer to a module handle,
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11273 * will be filled in with the handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11274 */
2037 a00e73284c97 Mac: Continuing const changes. Hopefully last Mac commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2035 diff changeset	11275 int dw_module_load(const char name, HMOD handle)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11276 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11277 int len;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11278 char *newname;
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1303 diff changeset	11279 char errorbuf[1025];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11280
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11281
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11282 if(!handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11283 return -1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11284
1110 404b639f096b Minor typecast fixes for warnings reported by clang on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1102 diff changeset	11285 if((len = (int)strlen(name)) == 0)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11286 return -1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11287
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11288 /* Lenth + "lib" + ".dylib" + NULL */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11289 newname = malloc(len + 10);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11290
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11291 if(!newname)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11292 return -1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11293
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11294 sprintf(newname, "lib%s.dylib", name);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11295 _my_strlwr(newname);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11296
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11297 *handle = dlopen(newname, RTLD_NOW);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11298 if(*handle == NULL)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11299 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11300 strncpy(errorbuf, dlerror(), 1024);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11301 printf("%s\n", errorbuf);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11302 sprintf(newname, "lib%s.dylib", name);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11303 *handle = dlopen(newname, RTLD_NOW);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11304 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11305
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11306 free(newname);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11307
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11308 return (NULL == *handle) ? -1 : 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11309 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11310
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11311 /* Queries the address of a symbol within open handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11312 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11313 * handle: Module handle returned by dw_module_load()
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11314 * name: Name of the symbol you want the address of.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11315 * func: A pointer to a function pointer, to obtain
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11316 * the address.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11317 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	11318 int dw_module_symbol(HMOD handle, const char name, void*func)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11319 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11320 if(!func \|\| !name)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11321 return -1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11322
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11323 if(strlen(name) == 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11324 return -1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11325
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11326 func = (void)dlsym(handle, name);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11327 return (NULL == *func);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11328 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11329
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11330 /* Frees the shared library previously opened.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11331 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11332 * handle: Module handle returned by dw_module_load()
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11333 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11334 int dw_module_close(HMOD handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11335 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11336 if(handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11337 return dlclose(handle);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11338 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11339 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11340
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11341 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11342 * Returns the handle to an unnamed mutex semaphore.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11343 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11344 HMTX dw_mutex_new(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11345 {
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	11346 HMTX mutex = malloc(sizeof(pthread_mutex_t));
727 f190b5c2ce16 Fixed 2 errors in the tree select event handler. Also removed unused experimental code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 726 diff changeset	11347
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	11348 pthread_mutex_init(mutex, NULL);
4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	11349 return mutex;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11350 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11351
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11352 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11353 * Closes a semaphore created by dw_mutex_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11354 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11355 * mutex: The handle to the mutex returned by dw_mutex_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11356 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11357 void dw_mutex_close(HMTX mutex)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11358 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11359 if(mutex)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11360 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11361 pthread_mutex_destroy(mutex);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11362 free(mutex);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11363 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11364 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11365
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11366 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11367 * Tries to gain access to the semaphore, if it can't it blocks.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11368 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11369 * mutex: The handle to the mutex returned by dw_mutex_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11370 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11371 void dw_mutex_lock(HMTX mutex)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11372 {
693 2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	11373 /* We need to handle locks from the main thread differently...
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	11374 * since we can't stop message processing... otherwise we
693 2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	11375 * will deadlock... so try to acquire the lock and continue
2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	11376 * processing messages in between tries.
2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	11377 */
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	11378 if(DWThread == pthread_self())
578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	11379 {
693 2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	11380 while(pthread_mutex_trylock(mutex) != 0)
2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	11381 {
725 4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	11382 /* Process any pending events */
4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	11383 while(_dw_main_iteration([NSDate dateWithTimeIntervalSinceNow:0.01]))
4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	11384 {
4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	11385 /* Just loop */
4e09c92363df Experimental changes to dw_main_sleep() and dw_main_iteration() to hopefully solve some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 724 diff changeset	11386 }
693 2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	11387 }
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	11388 }
693 2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	11389 else
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	11390 {
693 2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	11391 pthread_mutex_lock(mutex);
691 578bbfd8c904 Added initial thread synchronization code to stop the main loop when doing thread unsafe things. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 690 diff changeset	11392 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11393 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11394
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11395 /*
1158 f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	11396 * Tries to gain access to the semaphore.
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	11397 * Parameters:
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	11398 * mutex: The handle to the mutex returned by dw_mutex_new().
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	11399 * Returns:
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	11400 * DW_ERROR_NONE on success, DW_ERROR_TIMEOUT if it is already locked.
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	11401 */
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	11402 int API dw_mutex_trylock(HMTX mutex)
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	11403 {
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	11404 if(pthread_mutex_trylock(mutex) == 0)
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	11405 return DW_ERROR_NONE;
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	11406 return DW_ERROR_TIMEOUT;
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	11407 }
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	11408
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	11409 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11410 * Reliquishes the access to the semaphore.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11411 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11412 * mutex: The handle to the mutex returned by dw_mutex_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11413 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11414 void dw_mutex_unlock(HMTX mutex)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11415 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11416 pthread_mutex_unlock(mutex);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11417 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11418
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11419 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11420 * Returns the handle to an unnamed event semaphore.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11421 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11422 HEV dw_event_new(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11423 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11424 HEV eve = (HEV)malloc(sizeof(struct _dw_unix_event));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11425
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11426 if(!eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11427 return NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11428
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11429 /* We need to be careful here, mutexes on Linux are
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11430 * FAST by default but are error checking on other
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11431 * systems such as FreeBSD and OS/2, perhaps others.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11432 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11433 pthread_mutex_init (&(eve->mutex), NULL);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11434 pthread_mutex_lock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11435 pthread_cond_init (&(eve->event), NULL);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11436
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11437 pthread_mutex_unlock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11438 eve->alive = 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11439 eve->posted = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11440
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11441 return eve;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11442 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11443
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11444 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11445 * Resets a semaphore created by dw_event_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11446 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11447 * eve: The handle to the event returned by dw_event_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11448 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11449 int dw_event_reset (HEV eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11450 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11451 if(!eve)
986 87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 983 diff changeset	11452 return DW_ERROR_NON_INIT;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11453
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11454 pthread_mutex_lock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11455 pthread_cond_broadcast (&(eve->event));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11456 pthread_cond_init (&(eve->event), NULL);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11457 eve->posted = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11458 pthread_mutex_unlock (&(eve->mutex));
986 87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 983 diff changeset	11459 return DW_ERROR_NONE;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11460 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11461
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11462 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11463 * Posts a semaphore created by dw_event_new(). Causing all threads
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11464 * waiting on this event in dw_event_wait to continue.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11465 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11466 * eve: The handle to the event returned by dw_event_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11467 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11468 int dw_event_post (HEV eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11469 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11470 if(!eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11471 return FALSE;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11472
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11473 pthread_mutex_lock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11474 pthread_cond_broadcast (&(eve->event));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11475 eve->posted = 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11476 pthread_mutex_unlock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11477 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11478 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11479
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11480 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11481 * Waits on a semaphore created by dw_event_new(), until the
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11482 * event gets posted or until the timeout expires.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11483 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11484 * eve: The handle to the event returned by dw_event_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11485 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11486 int dw_event_wait(HEV eve, unsigned long timeout)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11487 {
1155 e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	11488 int rc;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	11489
1155 e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	11490 if(!eve)
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	11491 return DW_ERROR_NON_INIT;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	11492
1202 5c1a01c6384d Think we need to check the posted state inside the mutex... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1201 diff changeset	11493 pthread_mutex_lock (&(eve->mutex));
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	11494
1155 e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	11495 if(eve->posted)
1202 5c1a01c6384d Think we need to check the posted state inside the mutex... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1201 diff changeset	11496 {
5c1a01c6384d Think we need to check the posted state inside the mutex... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1201 diff changeset	11497 pthread_mutex_unlock (&(eve->mutex));
5c1a01c6384d Think we need to check the posted state inside the mutex... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1201 diff changeset	11498 return DW_ERROR_NONE;
5c1a01c6384d Think we need to check the posted state inside the mutex... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1201 diff changeset	11499 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	11500
1155 e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	11501 if(timeout != -1)
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	11502 {
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	11503 struct timeval now;
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	11504 struct timespec timeo;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	11505
1155 e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	11506 gettimeofday(&now, 0);
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	11507 timeo.tv_sec = now.tv_sec + (timeout / 1000);
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	11508 timeo.tv_nsec = now.tv_usec * 1000;
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	11509 rc = pthread_cond_timedwait(&(eve->event), &(eve->mutex), &timeo);
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	11510 }
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	11511 else
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	11512 rc = pthread_cond_wait(&(eve->event), &(eve->mutex));
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	11513 pthread_mutex_unlock (&(eve->mutex));
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	11514 if(!rc)
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	11515 return DW_ERROR_NONE;
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	11516 if(rc == ETIMEDOUT)
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	11517 return DW_ERROR_TIMEOUT;
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	11518 return DW_ERROR_GENERAL;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11519 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11520
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11521 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11522 * Closes a semaphore created by dw_event_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11523 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11524 * eve: The handle to the event returned by dw_event_new().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11525 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11526 int dw_event_close(HEV *eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11527 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11528 if(!eve \|\| !(*eve))
986 87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 983 diff changeset	11529 return DW_ERROR_NON_INIT;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11530
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11531 pthread_mutex_lock (&((*eve)->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11532 pthread_cond_destroy (&((*eve)->event));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11533 pthread_mutex_unlock (&((*eve)->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11534 pthread_mutex_destroy (&((*eve)->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11535 free(*eve);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11536 *eve = NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11537
986 87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 983 diff changeset	11538 return DW_ERROR_NONE;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11539 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11540
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11541 struct _seminfo {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11542 int fd;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11543 int waiting;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11544 };
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11545
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11546 static void _handle_sem(int *tmpsock)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11547 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11548 fd_set rd;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11549 struct _seminfo array = (struct _seminfo )malloc(sizeof(struct _seminfo));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11550 int listenfd = tmpsock[0];
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11551 int bytesread, connectcount = 1, maxfd, z, posted = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11552 char command;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11553 sigset_t mask;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11554
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11555 sigfillset(&mask); /* Mask all allowed signals */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11556 pthread_sigmask(SIG_BLOCK, &mask, NULL);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11557
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11558 /* problems */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11559 if(tmpsock[1] == -1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11560 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11561 free(array);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11562 return;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11563 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11564
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11565 array[0].fd = tmpsock[1];
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11566 array[0].waiting = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11567
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11568 /* Free the memory allocated in dw_named_event_new. */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11569 free(tmpsock);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11570
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11571 while(1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11572 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11573 FD_ZERO(&rd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11574 FD_SET(listenfd, &rd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11575
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11576 maxfd = listenfd;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11577
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11578 /* Added any connections to the named event semaphore */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11579 for(z=0;z<connectcount;z++)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11580 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11581 if(array[z].fd > maxfd)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11582 maxfd = array[z].fd;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11583
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11584 FD_SET(array[z].fd, &rd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11585 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11586
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11587 if(select(maxfd+1, &rd, NULL, NULL, NULL) == -1)
1886 f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	11588 {
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	11589 free(array);
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	11590 return;
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	11591 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11592
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11593 if(FD_ISSET(listenfd, &rd))
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11594 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11595 struct _seminfo *newarray;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11596 int newfd = accept(listenfd, 0, 0);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11597
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11598 if(newfd > -1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11599 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11600 /* Add new connections to the set */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11601 newarray = (struct _seminfo )malloc(sizeof(struct _seminfo)(connectcount+1));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11602 memcpy(newarray, array, sizeof(struct _seminfo)*(connectcount));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11603
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11604 newarray[connectcount].fd = newfd;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11605 newarray[connectcount].waiting = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11606
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11607 connectcount++;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11608
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11609 /* Replace old array with new one */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11610 free(array);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11611 array = newarray;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11612 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11613 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11614
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11615 /* Handle any events posted to the semaphore */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11616 for(z=0;z<connectcount;z++)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11617 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11618 if(FD_ISSET(array[z].fd, &rd))
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11619 {
1110 404b639f096b Minor typecast fixes for warnings reported by clang on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1102 diff changeset	11620 if((bytesread = (int)read(array[z].fd, &command, 1)) < 1)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11621 {
1764 5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	11622 struct _seminfo *newarray = NULL;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11623
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11624 /* Remove this connection from the set */
1764 5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	11625 if(connectcount > 1)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11626 {
1764 5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	11627 newarray = (struct _seminfo )malloc(sizeof(struct _seminfo)(connectcount-1));
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	11628 if(!z)
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	11629 memcpy(newarray, &array[1], sizeof(struct _seminfo)*(connectcount-1));
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	11630 else
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	11631 {
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	11632 memcpy(newarray, array, sizeof(struct _seminfo)*z);
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	11633 if(z!=(connectcount-1))
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	11634 memcpy(&newarray[z], &array[z+1], sizeof(struct _seminfo)*(z-connectcount-1));
5ffeea4a2a4b Fixed a memory leak in the Mac box code, items were not being freed when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1748 diff changeset	11635 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11636 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11637 connectcount--;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11638
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11639 /* Replace old array with new one */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11640 free(array);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11641 array = newarray;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11642 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11643 else if(bytesread == 1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11644 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11645 switch(command)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11646 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11647 case 0:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11648 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11649 /* Reset */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11650 posted = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11651 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11652 break;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11653 case 1:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11654 /* Post */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11655 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11656 int s;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11657 char tmp = (char)0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11658
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11659 posted = 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11660
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11661 for(s=0;s<connectcount;s++)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11662 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11663 /* The semaphore has been posted so
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11664 * we tell all the waiting threads to
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11665 * continue.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11666 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11667 if(array[s].waiting)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11668 write(array[s].fd, &tmp, 1);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11669 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11670 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11671 break;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11672 case 2:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11673 /* Wait */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11674 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11675 char tmp = (char)0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11676
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11677 array[z].waiting = 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11678
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11679 /* If we are posted exit immeditately */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11680 if(posted)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11681 write(array[z].fd, &tmp, 1);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11682 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11683 break;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11684 case 3:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11685 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11686 /* Done Waiting */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11687 array[z].waiting = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11688 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11689 break;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11690 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11691 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11692 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11693 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11694 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11695 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11696
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11697 /* Using domain sockets on unix for IPC */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11698 /* Create a named event semaphore which can be
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11699 * opened from other processes.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11700 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11701 * eve: Pointer to an event handle to receive handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11702 * name: Name given to semaphore which can be opened
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11703 * by other processes.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11704 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	11705 HEV dw_named_event_new(const char *name)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11706 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11707 struct sockaddr_un un;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11708 int ev, tmpsock = (int )malloc(sizeof(int)*2);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11709 HEV eve;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11710 DWTID dwthread;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11711
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11712 if(!tmpsock)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11713 return NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11714
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11715 eve = (HEV)malloc(sizeof(struct _dw_unix_event));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11716
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11717 if(!eve)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11718 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11719 free(tmpsock);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11720 return NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11721 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	11722
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11723 tmpsock[0] = socket(AF_UNIX, SOCK_STREAM, 0);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11724 ev = socket(AF_UNIX, SOCK_STREAM, 0);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11725 memset(&un, 0, sizeof(un));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11726 un.sun_family=AF_UNIX;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11727 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11728 strcpy(un.sun_path, "/tmp/.dw/");
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11729 strcat(un.sun_path, name);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11730
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11731 /* just to be safe, this should be changed
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11732 * to support multiple instances.
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11733 */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11734 remove(un.sun_path);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11735
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11736 bind(tmpsock[0], (struct sockaddr *)&un, sizeof(un));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11737 listen(tmpsock[0], 0);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11738 connect(ev, (struct sockaddr *)&un, sizeof(un));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11739 tmpsock[1] = accept(tmpsock[0], 0, 0);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11740
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11741 if(tmpsock[0] < 0 \|\| tmpsock[1] < 0 \|\| ev < 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11742 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11743 if(tmpsock[0] > -1)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11744 close(tmpsock[0]);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11745 if(tmpsock[1] > -1)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11746 close(tmpsock[1]);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11747 if(ev > -1)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11748 close(ev);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11749 free(tmpsock);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11750 free(eve);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11751 return NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11752 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11753
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11754 /* Create a thread to handle this event semaphore */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11755 pthread_create(&dwthread, NULL, (void )_handle_sem, (void )tmpsock);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11756 eve->alive = ev;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11757 return eve;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11758 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11759
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11760 /* Open an already existing named event semaphore.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11761 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11762 * eve: Pointer to an event handle to receive handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11763 * name: Name given to semaphore which can be opened
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11764 * by other processes.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11765 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	11766 HEV dw_named_event_get(const char *name)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11767 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11768 struct sockaddr_un un;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11769 HEV eve;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11770 int ev = socket(AF_UNIX, SOCK_STREAM, 0);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11771 if(ev < 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11772 return NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11773
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11774 eve = (HEV)malloc(sizeof(struct _dw_unix_event));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11775
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11776 if(!eve)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11777 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11778 close(ev);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11779 return NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11780 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11781
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11782 un.sun_family=AF_UNIX;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11783 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11784 strcpy(un.sun_path, "/tmp/.dw/");
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11785 strcat(un.sun_path, name);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11786 connect(ev, (struct sockaddr *)&un, sizeof(un));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11787 eve->alive = ev;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11788 return eve;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11789 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11790
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11791 /* Resets the event semaphore so threads who call wait
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11792 * on this semaphore will block.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11793 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11794 * eve: Handle to the semaphore obtained by
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11795 * an open or create call.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11796 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11797 int dw_named_event_reset(HEV eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11798 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11799 /* signal reset */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11800 char tmp = (char)0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11801
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11802 if(!eve \|\| eve->alive < 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11803 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11804
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11805 if(write(eve->alive, &tmp, 1) == 1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11806 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11807 return 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11808 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11809
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11810 /* Sets the posted state of an event semaphore, any threads
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11811 * waiting on the semaphore will no longer block.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11812 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11813 * eve: Handle to the semaphore obtained by
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11814 * an open or create call.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11815 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11816 int dw_named_event_post(HEV eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11817 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11818
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11819 /* signal post */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11820 char tmp = (char)1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11821
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11822 if(!eve \|\| eve->alive < 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11823 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11824
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11825 if(write(eve->alive, &tmp, 1) == 1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11826 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11827 return 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11828 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11829
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11830 /* Waits on the specified semaphore until it becomes
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11831 * posted, or returns immediately if it already is posted.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11832 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11833 * eve: Handle to the semaphore obtained by
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11834 * an open or create call.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11835 * timeout: Number of milliseconds before timing out
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11836 * or -1 if indefinite.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11837 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11838 int dw_named_event_wait(HEV eve, unsigned long timeout)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11839 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11840 fd_set rd;
1155 e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	11841 struct timeval tv, *useme = NULL;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11842 int retval = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11843 char tmp;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11844
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11845 if(!eve \|\| eve->alive < 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11846 return DW_ERROR_NON_INIT;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11847
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11848 /* Set the timout or infinite */
1155 e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	11849 if(timeout != -1)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11850 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11851 tv.tv_sec = timeout / 1000;
1110 404b639f096b Minor typecast fixes for warnings reported by clang on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1102 diff changeset	11852 tv.tv_usec = (int)timeout % 1000;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11853
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11854 useme = &tv;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11855 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11856
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11857 FD_ZERO(&rd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11858 FD_SET(eve->alive, &rd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11859
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11860 /* Signal wait */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11861 tmp = (char)2;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11862 write(eve->alive, &tmp, 1);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11863
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11864 retval = select(eve->alive+1, &rd, NULL, NULL, useme);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11865
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11866 /* Signal done waiting. */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11867 tmp = (char)3;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11868 write(eve->alive, &tmp, 1);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11869
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11870 if(retval == 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11871 return DW_ERROR_TIMEOUT;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11872 else if(retval == -1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11873 return DW_ERROR_INTERRUPT;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11874
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11875 /* Clear the entry from the pipe so
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11876 * we don't loop endlessly. :)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11877 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11878 read(eve->alive, &tmp, 1);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11879 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11880 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11881
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11882 /* Release this semaphore, if there are no more open
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11883 * handles on this semaphore the semaphore will be destroyed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11884 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11885 * eve: Handle to the semaphore obtained by
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11886 * an open or create call.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11887 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11888 int dw_named_event_close(HEV eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11889 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11890 /* Finally close the domain socket,
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11891 * cleanup will continue in _handle_sem.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11892 */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11893 if(eve)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11894 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11895 close(eve->alive);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11896 free(eve);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11897 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11898 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11899 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11900
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11901 /* Mac specific function to cause garbage collection */
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11902 void _dw_pool_drain(void)
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11903 {
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11904 #if !defined(GARBAGE_COLLECT)
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11905 NSAutoreleasePool *pool = pthread_getspecific(_dw_pool_key);
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11906 [pool drain];
698 e19f69a78f21 Fix for pool being removed and not just drained. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 697 diff changeset	11907 pool = [[NSAutoreleasePool alloc] init];
e19f69a78f21 Fix for pool being removed and not just drained. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 697 diff changeset	11908 pthread_setspecific(_dw_pool_key, pool);
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	11909 #endif
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11910 }
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11911
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	11912 /*
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11913 * Generally an internal function called from a newly created
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11914 * thread to setup the Dynamic Windows environment for the thread.
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11915 * However it is exported so language bindings can call it when
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11916 * they create threads that require access to Dynamic Windows.
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11917 */
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11918 void API _dw_init_thread(void)
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11919 {
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	11920 /* If we aren't using garbage collection we need autorelease pools */
660 2784e7ee8bcb Fixes for pixmaps and drawing to the screen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 659 diff changeset	11921 #if !defined(GARBAGE_COLLECT)
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11922 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11923 pthread_setspecific(_dw_pool_key, pool);
660 2784e7ee8bcb Fixes for pixmaps and drawing to the screen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 659 diff changeset	11924 #endif
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	11925 _init_colors();
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11926 }
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11927
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	11928 /*
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11929 * Generally an internal function called from a terminating
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11930 * thread to cleanup the Dynamic Windows environment for the thread.
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11931 * However it is exported so language bindings can call it when
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11932 * they exit threads that require access to Dynamic Windows.
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11933 */
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11934 void API _dw_deinit_thread(void)
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11935 {
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11936 NSColor *color;
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	11937
671 c60a4f6cfae8 Implemented icon support on the Mac. In the process created a new HICN type. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 670 diff changeset	11938 /* Release the pool when we are done so we don't leak */
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	11939 color = pthread_getspecific(_dw_fg_color_key);
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	11940 [color release];
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	11941 color = pthread_getspecific(_dw_bg_color_key);
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	11942 [color release];
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	11943 #if !defined(GARBAGE_COLLECT)
698 e19f69a78f21 Fix for pool being removed and not just drained. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 697 diff changeset	11944 pool = pthread_getspecific(_dw_pool_key);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11945 [pool drain];
666 e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	11946 #endif
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11947 }
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11948
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11949 /*
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11950 * Setup thread independent pools.
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11951 */
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11952 void _dwthreadstart(void *data)
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11953 {
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11954 void (threadfunc)(void ) = NULL;
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11955 void tmp = (void )data;
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11956
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11957 _dw_init_thread();
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	11958
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11959 threadfunc = (void ()(void ))tmp[0];
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11960
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11961 /* Start our thread function */
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11962 threadfunc(tmp[1]);
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11963
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	11964 free(tmp);
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	11965
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11966 _dw_deinit_thread();
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11967 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11968
1075 3d117071a50b Renamed Mac _dw_default_font() to dw_font_set_default() and added it on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1074 diff changeset	11969 /*
3d117071a50b Renamed Mac _dw_default_font() to dw_font_set_default() and added it on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1074 diff changeset	11970 * Sets the default font used on text based widgets.
3d117071a50b Renamed Mac _dw_default_font() to dw_font_set_default() and added it on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1074 diff changeset	11971 * Parameters:
3d117071a50b Renamed Mac _dw_default_font() to dw_font_set_default() and added it on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1074 diff changeset	11972 * fontname: Font name in Dynamic Windows format.
3d117071a50b Renamed Mac _dw_default_font() to dw_font_set_default() and added it on OS/2 and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1074 diff changeset	11973 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	11974 void API dw_font_set_default(const char *fontname)
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	11975 {
1241 459426f31fb4 Slight thread safety fix on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1239 diff changeset	11976 NSFont *oldfont = DWDefaultFont;
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	11977 DWDefaultFont = _dw_font_by_name(fontname);
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	11978 [DWDefaultFont retain];
1241 459426f31fb4 Slight thread safety fix on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1239 diff changeset	11979 [oldfont release];
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	11980 }
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	11981
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11982 /*
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11983 * Initializes the Dynamic Windows engine.
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11984 * Parameters:
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11985 * newthread: True if this is the only thread.
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11986 * False if there is already a message loop running.
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11987 */
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11988 int API dw_init(int newthread, int argc, char *argv[])
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11989 {
1786 9a32d4216f24 Make sure we set the locale on Mac and it is UTF-8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1784 diff changeset	11990 char *lang = getenv("LANG");
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	11991
1098 9e1d6fa397be Experimental change to set the current working directory to the bundle path on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1093 diff changeset	11992 /* Correct the startup path if run from a bundle */
9e1d6fa397be Experimental change to set the current working directory to the bundle path on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1093 diff changeset	11993 if(argc > 0 && argv[0])
9e1d6fa397be Experimental change to set the current working directory to the bundle path on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1093 diff changeset	11994 {
9e1d6fa397be Experimental change to set the current working directory to the bundle path on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1093 diff changeset	11995 char *pathcopy = strdup(argv[0]);
9e1d6fa397be Experimental change to set the current working directory to the bundle path on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1093 diff changeset	11996 char *app = strstr(pathcopy, ".app/");
1128 7d7535f6bc4e Added ability to set background color of MLE; setting foreground still outstanding. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1120 diff changeset	11997
1098 9e1d6fa397be Experimental change to set the current working directory to the bundle path on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1093 diff changeset	11998 if(app)
9e1d6fa397be Experimental change to set the current working directory to the bundle path on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1093 diff changeset	11999 {
1381 3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	12000 char pathbuf[PATH_MAX+1] = { 0 };
3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	12001 size_t len = (size_t)(app - pathcopy);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12002
1381 3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	12003 if(len > 0)
1385 fc20ad815428 Don't need to include the / after the .app on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1384 diff changeset	12004 strncpy(_dw_bundle_path, pathcopy, len + 4);
1098 9e1d6fa397be Experimental change to set the current working directory to the bundle path on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1093 diff changeset	12005 *app = 0;
1128 7d7535f6bc4e Added ability to set background color of MLE; setting foreground still outstanding. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1120 diff changeset	12006
1098 9e1d6fa397be Experimental change to set the current working directory to the bundle path on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1093 diff changeset	12007 getcwd(pathbuf, PATH_MAX);
1128 7d7535f6bc4e Added ability to set background color of MLE; setting foreground still outstanding. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1120 diff changeset	12008
1098 9e1d6fa397be Experimental change to set the current working directory to the bundle path on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1093 diff changeset	12009 /* If run from a bundle the path seems to be / */
9e1d6fa397be Experimental change to set the current working directory to the bundle path on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1093 diff changeset	12010 if(strcmp(pathbuf, "/") == 0)
9e1d6fa397be Experimental change to set the current working directory to the bundle path on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1093 diff changeset	12011 {
1381 3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	12012 char *pos = strrchr(pathcopy, '/');
3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	12013
3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	12014 if(pos)
1098 9e1d6fa397be Experimental change to set the current working directory to the bundle path on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1093 diff changeset	12015 {
1381 3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	12016 strncpy(pathbuf, pathcopy, (size_t)(pos - pathcopy));
3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	12017 chdir(pathbuf);
1098 9e1d6fa397be Experimental change to set the current working directory to the bundle path on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1093 diff changeset	12018 }
9e1d6fa397be Experimental change to set the current working directory to the bundle path on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1093 diff changeset	12019 }
9e1d6fa397be Experimental change to set the current working directory to the bundle path on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1093 diff changeset	12020 }
1383 ead81c3d9e4e Thought I was fixing a memory leak but I was seeing the {} wrong. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1381 diff changeset	12021 if(pathcopy)
ead81c3d9e4e Thought I was fixing a memory leak but I was seeing the {} wrong. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1381 diff changeset	12022 free(pathcopy);
ead81c3d9e4e Thought I was fixing a memory leak but I was seeing the {} wrong. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1381 diff changeset	12023 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12024
1381 3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	12025 /* Just in case we can't obtain a path */
3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	12026 if(!_dw_bundle_path[0])
3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	12027 getcwd(_dw_bundle_path, PATH_MAX);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12028
751 eba6ab48c952 Runtime Snow Leopard checks where possible and visual fix for Leopard status text. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 749 diff changeset	12029 /* Get the operating system version */
1770 2396655d43f1 Fix some warnings with Mac 10.8 and Xcode 4.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12030 NSString *version = [[NSProcessInfo processInfo] operatingSystemVersionString];
2396655d43f1 Fix some warnings with Mac 10.8 and Xcode 4.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12031 const char *versionstr = [version UTF8String];
2396655d43f1 Fix some warnings with Mac 10.8 and Xcode 4.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12032 sscanf(versionstr, "Version %d.%d.%d", &DWOSMajor, &DWOSMinor, &DWOSBuild);
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12033 /* Set the locale... if it is UTF-8 pass it
1786 9a32d4216f24 Make sure we set the locale on Mac and it is UTF-8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1784 diff changeset	12034 * directly, otherwise specify UTF-8 explicitly.
9a32d4216f24 Make sure we set the locale on Mac and it is UTF-8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1784 diff changeset	12035 */
9a32d4216f24 Make sure we set the locale on Mac and it is UTF-8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1784 diff changeset	12036 setlocale(LC_ALL, lang && strstr(lang, ".UTF-8") ? lang : "UTF-8");
736 5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	12037 /* Create the application object */
5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	12038 DWApp = [NSApplication sharedApplication];
1843 2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	12039 DWAppDel *del = [[DWAppDel alloc] init];
2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	12040 [DWApp setDelegate:del];
736 5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	12041 /* Create object for handling timers */
5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	12042 DWHandler = [[DWTimerHandler alloc] init];
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	12043 /* If we aren't using garbage collection we need autorelease pools */
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	12044 #if !defined(GARBAGE_COLLECT)
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	12045 pthread_key_create(&_dw_pool_key, NULL);
736 5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	12046 pool = [[NSAutoreleasePool alloc] init];
726 ecf47778caff Possible fix for container string columns not showing correctly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 725 diff changeset	12047 pthread_setspecific(_dw_pool_key, pool);
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	12048 #endif
826 6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	12049 pthread_key_create(&_dw_fg_color_key, NULL);
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	12050 pthread_key_create(&_dw_bg_color_key, NULL);
6bb8bff36548 Implemented thread specific colors. Allows threads to have their own colors... also reducing color object recreation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 825 diff changeset	12051 _init_colors();
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	12052 /* Create a default main menu, with just the application menu */
736 5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	12053 DWMainMenu = _generate_main_menu();
5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	12054 [DWMainMenu retain];
5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	12055 [DWApp setMainMenu:DWMainMenu];
5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	12056 DWObj = [[DWObject alloc] init];
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	12057 DWDefaultFont = nil;
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	12058 #ifdef BUILDING_FOR_MOJAVE
2067 3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	12059 if (@available(macOS 10.14, *))
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	12060 {
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	12061 [[UNUserNotificationCenter currentNotificationCenter] requestAuthorizationWithOptions:UNAuthorizationOptionAlert
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	12062 completionHandler:^(BOOL granted, NSError * _Nullable error) {
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	12063 if (!granted) {
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	12064 NSLog(@"Unable to get notification permission.");
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	12065 }
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	12066 }];
3ccd0da07514 Mac: Initial notification support for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2064 diff changeset	12067 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	12068 _DWDirtyDrawables = [[NSMutableArray alloc] init];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	12069 #else
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	12070 /* Create mutexes for thread safety */
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	12071 DWRunMutex = dw_mutex_new();
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	12072 DWThreadMutex = dw_mutex_new();
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	12073 DWThreadMutex2 = dw_mutex_new();
1954 85229fe9ae5a Mac: 10.14 doesn't like too many needsDisplays so instead we keep a list of bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1953 diff changeset	12074 #endif
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	12075 /* Use NSThread to start a dummy thread to initialize the threading subsystem */
736 5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	12076 NSThread *thread = [[ NSThread alloc] initWithTarget:DWObj selector:@selector(uselessThread:) object:nil];
5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	12077 [thread start];
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	12078 [thread release];
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	12079 [NSTextField setCellClass:[DWTextFieldCell class]];
736 5b48519a7fb2 Added retains to the window menus so they don't get autoreleased when switching between bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 735 diff changeset	12080 return 0;
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	12081 }
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	12082
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	12083 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12084 * Allocates a shared memory region with a name.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12085 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12086 * handle: A pointer to receive a SHM identifier.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12087 * dest: A pointer to a pointer to receive the memory address.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12088 * size: Size in bytes of the shared memory region to allocate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12089 * name: A string pointer to a unique memory name.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12090 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	12091 HSHM dw_named_memory_new(void *dest, int size, const char name)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12092 {
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1303 diff changeset	12093 char namebuf[1025] = {0};
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12094 struct _dw_unix_shm *handle = malloc(sizeof(struct _dw_unix_shm));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12095
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12096 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1303 diff changeset	12097 snprintf(namebuf, 1024, "/tmp/.dw/%s", name);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12098
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12099 if((handle->fd = open(namebuf, O_CREAT \| O_RDWR, S_IRUSR \| S_IWUSR)) < 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12100 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12101 free(handle);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12102 return NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12103 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12104
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12105 ftruncate(handle->fd, size);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12106
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12107 /* attach the shared memory segment to our process's address space. */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12108 *dest = mmap(NULL, size, PROT_READ \| PROT_WRITE, MAP_SHARED, handle->fd, 0);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12109
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12110 if(*dest == MAP_FAILED)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12111 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12112 close(handle->fd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12113 *dest = NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12114 free(handle);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12115 return NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12116 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12117
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12118 handle->size = size;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12119 handle->sid = getsid(0);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12120 handle->path = strdup(namebuf);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12121
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12122 return handle;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12123 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12124
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12125 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12126 * Aquires shared memory region with a name.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12127 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12128 * dest: A pointer to a pointer to receive the memory address.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12129 * size: Size in bytes of the shared memory region to requested.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12130 * name: A string pointer to a unique memory name.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12131 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	12132 HSHM dw_named_memory_get(void *dest, int size, const char name)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12133 {
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1303 diff changeset	12134 char namebuf[1025];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12135 struct _dw_unix_shm *handle = malloc(sizeof(struct _dw_unix_shm));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12136
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12137 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1303 diff changeset	12138 snprintf(namebuf, 1024, "/tmp/.dw/%s", name);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12139
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12140 if((handle->fd = open(namebuf, O_RDWR)) < 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12141 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12142 free(handle);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12143 return NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12144 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12145
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12146 /* attach the shared memory segment to our process's address space. */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12147 *dest = mmap(NULL, size, PROT_READ \| PROT_WRITE, MAP_SHARED, handle->fd, 0);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12148
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12149 if(*dest == MAP_FAILED)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12150 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12151 close(handle->fd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12152 *dest = NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12153 free(handle);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12154 return NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12155 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12156
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12157 handle->size = size;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12158 handle->sid = -1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12159 handle->path = NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12160
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12161 return handle;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12162 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12163
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12164 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12165 * Frees a shared memory region previously allocated.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12166 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12167 * handle: Handle obtained from DB_named_memory_allocate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12168 * ptr: The memory address aquired with DB_named_memory_allocate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12169 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12170 int dw_named_memory_free(HSHM handle, void *ptr)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12171 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12172 struct _dw_unix_shm *h = handle;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12173 int rc = munmap(ptr, h->size);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12174
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12175 close(h->fd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12176 if(h->path)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12177 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12178 /* Only remove the actual file if we are the
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12179 * creator of the file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12180 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12181 if(h->sid != -1 && h->sid == getsid(0))
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12182 remove(h->path);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12183 free(h->path);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12184 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12185 return rc;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12186 }
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	12187
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12188 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12189 * Creates a new thread with a starting point of func.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12190 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12191 * func: Function which will be run in the new thread.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12192 * data: Parameter(s) passed to the function.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12193 * stack: Stack size of new thread (OS/2 and Windows only).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12194 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12195 DWTID dw_thread_new(void func, void data, int stack)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12196 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12197 DWTID thread;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12198 void *tmp = malloc(sizeof(void ) * 2);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12199 int rc;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12200
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12201 tmp[0] = func;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12202 tmp[1] = data;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12203
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12204 rc = pthread_create(&thread, NULL, (void )_dwthreadstart, (void )tmp);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12205 if(rc == 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12206 return thread;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12207 return (DWTID)-1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12208 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12209
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12210 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12211 * Ends execution of current thread immediately.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12212 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12213 void dw_thread_end(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12214 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12215 pthread_exit(NULL);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12216 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12217
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12218 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12219 * Returns the current thread's ID.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12220 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12221 DWTID dw_thread_id(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12222 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12223 return (DWTID)pthread_self();
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12224 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12225
661 eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12226 /*
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12227 * Execute and external program in a seperate session.
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12228 * Parameters:
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12229 * program: Program name with optional path.
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12230 * type: Either DW_EXEC_CON or DW_EXEC_GUI.
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12231 * params: An array of pointers to string arguements.
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12232 * Returns:
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12233 * -1 on error.
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12234 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	12235 int dw_exec(const char program, int type, char *params)
661 eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12236 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12237 int ret = -1;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	12238
738 52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	12239 if(type == DW_EXEC_GUI)
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	12240 {
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	12241 if(params && params[0] && params[1])
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	12242 {
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	12243 [[NSWorkspace sharedWorkspace] openFile:[NSString stringWithUTF8String:params[1]]
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	12244 withApplication:[NSString stringWithUTF8String:program]];
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	12245 }
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	12246 else
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	12247 {
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	12248 [[NSWorkspace sharedWorkspace] launchApplication:[NSString stringWithUTF8String:program]];
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	12249 }
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	12250 return 0;
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	12251 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	12252
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12253 if((ret = fork()) == 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12254 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12255 int i;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	12256
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12257 for (i = 3; i < 256; i++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12258 close(i);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12259 setsid();
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	12260
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12261 if(type == DW_EXEC_CON)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12262 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12263 char **tmpargs;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	12264
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12265 if(!params)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12266 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12267 tmpargs = malloc(sizeof(char *));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12268 tmpargs[0] = NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12269 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12270 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12271 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12272 int z = 0;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	12273
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12274 while(params[z])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12275 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12276 z++;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12277 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12278 tmpargs = malloc(sizeof(char )(z+3));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12279 z=0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12280 tmpargs[0] = "xterm";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12281 tmpargs[1] = "-e";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12282 while(params[z])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12283 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12284 tmpargs[z+2] = params[z];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12285 z++;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12286 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12287 tmpargs[z+2] = NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12288 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12289 execvp("xterm", tmpargs);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12290 free(tmpargs);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12291 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12292 /* If we got here exec failed */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12293 _exit(-1);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12294 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12295 return ret;
661 eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12296 }
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12297
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12298 /*
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12299 * Loads a web browser pointed at the given URL.
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12300 * Parameters:
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12301 * url: Uniform resource locator.
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12302 */
2037 a00e73284c97 Mac: Continuing const changes. Hopefully last Mac commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2035 diff changeset	12303 int dw_browse(const char *url)
661 eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12304 {
715 5f8102bd7646 dw_browse() reimplmented so it actually works as expected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 714 diff changeset	12305 NSURL *myurl = [NSURL URLWithString:[NSString stringWithUTF8String:url]];
5f8102bd7646 dw_browse() reimplmented so it actually works as expected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 714 diff changeset	12306 [[NSWorkspace sharedWorkspace] openURL:myurl];
1115 03cd2f3e929d Fixed a documentation and template error regarding dw_browse() return code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1110 diff changeset	12307 return DW_ERROR_NONE;
03cd2f3e929d Fixed a documentation and template error regarding dw_browse() return code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1110 diff changeset	12308 }
1137 e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12309
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12310 typedef struct _dwprint
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12311 {
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12312 NSPrintInfo *pi;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12313 int (drawfunc)(HPRINT, HPIXMAP, int, void );
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12314 void *drawdata;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12315 unsigned long flags;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12316 } DWPrint;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12317
1137 e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12318 /*
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12319 * Creates a new print object.
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12320 * Parameters:
1152 58b5374355ab Added print jobname parameter to dw_print_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1147 diff changeset	12321 * jobname: Name of the print job to show in the queue.
1137 e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12322 * flags: Flags to initially configure the print object.
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12323 * pages: Number of pages to print.
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12324 * drawfunc: The pointer to the function to be used as the callback.
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12325 * drawdata: User data to be passed to the handler function.
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12326 * Returns:
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12327 * A handle to the print object or NULL on failure.
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12328 */
2037 a00e73284c97 Mac: Continuing const changes. Hopefully last Mac commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2035 diff changeset	12329 HPRINT API dw_print_new(const char jobname, unsigned long flags, unsigned int pages, void drawfunc, void *drawdata)
1137 e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12330 {
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12331 DWPrint *print;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12332 NSPrintPanel *panel;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12333 PMPrintSettings settings;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12334 NSPrintInfo *pi;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12335
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12336 if(!drawfunc \|\| !(print = calloc(1, sizeof(DWPrint))))
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12337 {
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12338 return NULL;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12339 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12340
1152 58b5374355ab Added print jobname parameter to dw_print_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1147 diff changeset	12341 if(!jobname)
58b5374355ab Added print jobname parameter to dw_print_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1147 diff changeset	12342 jobname = "Dynamic Windows Print Job";
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12343
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12344 print->drawfunc = drawfunc;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12345 print->drawdata = drawdata;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12346 print->flags = flags;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12347
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12348 /* Get the page range */
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12349 pi = [NSPrintInfo sharedPrintInfo];
1237 f8673299ec37 Ok if we setup the print information on Mac we get a better size... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1236 diff changeset	12350 [pi setHorizontalPagination:NSFitPagination];
f8673299ec37 Ok if we setup the print information on Mac we get a better size... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1236 diff changeset	12351 [pi setHorizontallyCentered:YES];
f8673299ec37 Ok if we setup the print information on Mac we get a better size... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1236 diff changeset	12352 [pi setVerticalPagination:NSFitPagination];
f8673299ec37 Ok if we setup the print information on Mac we get a better size... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1236 diff changeset	12353 [pi setVerticallyCentered:YES];
1903 b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	12354 [pi setOrientation:DWPaperOrientationPortrait];
1237 f8673299ec37 Ok if we setup the print information on Mac we get a better size... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1236 diff changeset	12355 [pi setLeftMargin:0.0];
f8673299ec37 Ok if we setup the print information on Mac we get a better size... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1236 diff changeset	12356 [pi setRightMargin:0.0];
f8673299ec37 Ok if we setup the print information on Mac we get a better size... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1236 diff changeset	12357 [pi setTopMargin:0.0];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12358 [pi setBottomMargin:0.0];
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12359
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12360 settings = [pi PMPrintSettings];
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12361 PMSetPageRange(settings, 1, pages);
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12362 PMSetFirstPage(settings, 1, true);
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12363 PMSetLastPage(settings, pages, true);
1152 58b5374355ab Added print jobname parameter to dw_print_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1147 diff changeset	12364 PMPrintSettingsSetJobName(settings, (CFStringRef)[NSString stringWithUTF8String:jobname]);
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12365 [pi updateFromPMPrintSettings];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12366
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12367 /* Create and show the print panel */
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12368 panel = [NSPrintPanel printPanel];
1903 b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	12369 if(!panel \|\| [panel runModalWithPrintInfo:pi] == DWModalResponseCancel)
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12370 {
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12371 free(print);
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12372 return NULL;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12373 }
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12374 /* Put the print info from the panel into the operation */
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12375 print->pi = pi;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12376
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12377 return print;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12378 }
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12379
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12380 /*
1137 e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12381 * Runs the print job, causing the draw page callbacks to fire.
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12382 * Parameters:
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12383 * print: Handle to the print object returned by dw_print_new().
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12384 * flags: Flags to run the print job.
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12385 * Returns:
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12386 * DW_ERROR_UNKNOWN on error or DW_ERROR_NONE on success.
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12387 */
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12388 int API dw_print_run(HPRINT print, unsigned long flags)
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12389 {
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12390 DWPrint *p = print;
1175 eb4589ddff3e Added some test code to save what we are trying to print as a PNG on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1160 diff changeset	12391 NSBitmapImageRep rep, rep2;
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12392 NSPrintInfo *pi;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12393 NSPrintOperation *po;
1175 eb4589ddff3e Added some test code to save what we are trying to print as a PNG on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1160 diff changeset	12394 HPIXMAP pixmap, pixmap2;
eb4589ddff3e Added some test code to save what we are trying to print as a PNG on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1160 diff changeset	12395 NSImage image, flipped;
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12396 NSImageView *iv;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12397 NSSize size;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12398 PMPrintSettings settings;
1143 b1b23de965d7 Fixed using a pointer after being free()ed on Windows and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1141 diff changeset	12399 int x, result = DW_ERROR_UNKNOWN;
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12400 UInt32 start, end;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12401
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12402 if(!p)
1143 b1b23de965d7 Fixed using a pointer after being free()ed on Windows and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1141 diff changeset	12403 return result;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12404
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	12405 DW_LOCAL_POOL_IN;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12406
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12407 /* Figure out the printer/paper size */
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12408 pi = p->pi;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12409 size = [pi paperSize];
1234 bee6fc8119ec Paper size reported on Mac height is for all pages... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1230 diff changeset	12410
bee6fc8119ec Paper size reported on Mac height is for all pages... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1230 diff changeset	12411 /* Get the page range */
bee6fc8119ec Paper size reported on Mac height is for all pages... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1230 diff changeset	12412 settings = [pi PMPrintSettings];
bee6fc8119ec Paper size reported on Mac height is for all pages... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1230 diff changeset	12413 PMGetFirstPage(settings, &start);
bee6fc8119ec Paper size reported on Mac height is for all pages... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1230 diff changeset	12414 if(start > 0)
bee6fc8119ec Paper size reported on Mac height is for all pages... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1230 diff changeset	12415 start--;
bee6fc8119ec Paper size reported on Mac height is for all pages... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1230 diff changeset	12416 PMGetLastPage(settings, &end);
bee6fc8119ec Paper size reported on Mac height is for all pages... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1230 diff changeset	12417 PMSetPageRange(settings, 1, 1);
bee6fc8119ec Paper size reported on Mac height is for all pages... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1230 diff changeset	12418 PMSetFirstPage(settings, 1, true);
bee6fc8119ec Paper size reported on Mac height is for all pages... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1230 diff changeset	12419 PMSetLastPage(settings, 1, true);
bee6fc8119ec Paper size reported on Mac height is for all pages... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1230 diff changeset	12420 [pi updateFromPMPrintSettings];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12421
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12422 /* Create an image view to print and a pixmap to draw into */
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12423 iv = [[NSImageView alloc] init];
1143 b1b23de965d7 Fixed using a pointer after being free()ed on Windows and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1141 diff changeset	12424 pixmap = dw_pixmap_new(iv, (int)size.width, (int)size.height, 8);
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12425 rep = pixmap->image;
1175 eb4589ddff3e Added some test code to save what we are trying to print as a PNG on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1160 diff changeset	12426 pixmap2 = dw_pixmap_new(iv, (int)size.width, (int)size.height, 8);
eb4589ddff3e Added some test code to save what we are trying to print as a PNG on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1160 diff changeset	12427 rep2 = pixmap2->image;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12428
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12429 /* Create an image with the data from the pixmap
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12430 * to go into the image view.
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12431 */
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12432 image = [[NSImage alloc] initWithSize:[rep size]];
1175 eb4589ddff3e Added some test code to save what we are trying to print as a PNG on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1160 diff changeset	12433 flipped = [[NSImage alloc] initWithSize:[rep size]];
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12434 [image addRepresentation:rep];
1176 408ea33b19cf Ok fixed a problem with the last commit using the wrong representation on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1175 diff changeset	12435 [flipped addRepresentation:rep2];
1175 eb4589ddff3e Added some test code to save what we are trying to print as a PNG on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1160 diff changeset	12436 [iv setImage:flipped];
1902 74f50459c530 Fix some deprecations introduced in Mac OS X Yosemite 10.10... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1896 diff changeset	12437 [iv setImageScaling:NSImageScaleProportionallyDown];
1144 5878dbfafbe2 Need to size the NSImageView to print it apparently on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1143 diff changeset	12438 [iv setFrameOrigin:NSMakePoint(0,0)];
5878dbfafbe2 Need to size the NSImageView to print it apparently on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1143 diff changeset	12439 [iv setFrameSize:size];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12440
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12441 /* Create the print operation using the image view and
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12442 * print info obtained from the panel in the last call.
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12443 */
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12444 po = [NSPrintOperation printOperationWithView:iv printInfo:pi];
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12445 [po setShowsPrintPanel:NO];
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12446
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12447 /* Cycle through each page */
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12448 for(x=start; x<end && p->drawfunc; x++)
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12449 {
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12450 /* Call the application's draw function */
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12451 p->drawfunc(print, pixmap, x, p->drawdata);
1340 890890c31ba6 Another printing cancel fix for the Mac and updated the readme. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1335 diff changeset	12452 if(p->drawfunc)
890890c31ba6 Another printing cancel fix for the Mac and updated the readme. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1335 diff changeset	12453 {
890890c31ba6 Another printing cancel fix for the Mac and updated the readme. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1335 diff changeset	12454 /* Internal representation is flipped... so flip again so we can print */
890890c31ba6 Another printing cancel fix for the Mac and updated the readme. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1335 diff changeset	12455 _flip_image(image, rep2, size);
890890c31ba6 Another printing cancel fix for the Mac and updated the readme. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1335 diff changeset	12456 #ifdef DEBUG_PRINT
890890c31ba6 Another printing cancel fix for the Mac and updated the readme. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1335 diff changeset	12457 /* Save it to file to see what we have */
890890c31ba6 Another printing cancel fix for the Mac and updated the readme. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1335 diff changeset	12458 NSData *data = [rep2 representationUsingType: NSPNGFileType properties: nil];
890890c31ba6 Another printing cancel fix for the Mac and updated the readme. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1335 diff changeset	12459 [data writeToFile: @"print.png" atomically: NO];
890890c31ba6 Another printing cancel fix for the Mac and updated the readme. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1335 diff changeset	12460 #endif
890890c31ba6 Another printing cancel fix for the Mac and updated the readme. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1335 diff changeset	12461 /* Print the image view */
890890c31ba6 Another printing cancel fix for the Mac and updated the readme. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1335 diff changeset	12462 [po runOperation];
890890c31ba6 Another printing cancel fix for the Mac and updated the readme. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1335 diff changeset	12463 /* Fill the pixmap with white in case we are printing more pages */
890890c31ba6 Another printing cancel fix for the Mac and updated the readme. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1335 diff changeset	12464 dw_color_foreground_set(DW_CLR_WHITE);
890890c31ba6 Another printing cancel fix for the Mac and updated the readme. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1335 diff changeset	12465 dw_draw_rect(0, pixmap, TRUE, 0, 0, (int)size.width, (int)size.height);
890890c31ba6 Another printing cancel fix for the Mac and updated the readme. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1335 diff changeset	12466 }
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12467 }
1143 b1b23de965d7 Fixed using a pointer after being free()ed on Windows and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1141 diff changeset	12468 if(p->drawfunc)
b1b23de965d7 Fixed using a pointer after being free()ed on Windows and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1141 diff changeset	12469 result = DW_ERROR_NONE;
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12470 /* Free memory */
1144 5878dbfafbe2 Need to size the NSImageView to print it apparently on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1143 diff changeset	12471 [image release];
1175 eb4589ddff3e Added some test code to save what we are trying to print as a PNG on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1160 diff changeset	12472 [flipped release];
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12473 dw_pixmap_destroy(pixmap);
1175 eb4589ddff3e Added some test code to save what we are trying to print as a PNG on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1160 diff changeset	12474 dw_pixmap_destroy(pixmap2);
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12475 free(p);
1144 5878dbfafbe2 Need to size the NSImageView to print it apparently on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1143 diff changeset	12476 [iv release];
1582 728778634933 Performed a more thorough audit of functions on Mac that require local pools. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1580 diff changeset	12477 DW_LOCAL_POOL_OUT;
1143 b1b23de965d7 Fixed using a pointer after being free()ed on Windows and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1141 diff changeset	12478 return result;
1137 e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12479 }
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12480
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12481 /*
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12482 * Cancels the print job, typically called from a draw page callback.
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12483 * Parameters:
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12484 * print: Handle to the print object returned by dw_print_new().
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12485 */
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12486 void API dw_print_cancel(HPRINT print)
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12487 {
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12488 DWPrint *p = print;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12489
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12490 if(p)
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12491 p->drawfunc = NULL;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12492 }
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12493
1783 9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12494 /*
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12495 * Converts a UTF-8 encoded string into a wide string.
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12496 * Parameters:
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12497 * utf8string: UTF-8 encoded source string.
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12498 * Returns:
1784 86ace55df07b Added UTF8/Wide conversion functions on OS/2 and Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1783 diff changeset	12499 * Wide string that needs to be freed with dw_free()
86ace55df07b Added UTF8/Wide conversion functions on OS/2 and Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1783 diff changeset	12500 * or NULL on failure.
1783 9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12501 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	12502 wchar_t * API dw_utf8_to_wchar(const char *utf8string)
1783 9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12503 {
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12504 size_t buflen = strlen(utf8string) + 1;
1784 86ace55df07b Added UTF8/Wide conversion functions on OS/2 and Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1783 diff changeset	12505 wchar_t temp = malloc(buflen sizeof(wchar_t));
86ace55df07b Added UTF8/Wide conversion functions on OS/2 and Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1783 diff changeset	12506 if(temp)
86ace55df07b Added UTF8/Wide conversion functions on OS/2 and Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1783 diff changeset	12507 mbstowcs(temp, utf8string, buflen);
86ace55df07b Added UTF8/Wide conversion functions on OS/2 and Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1783 diff changeset	12508 return temp;
1783 9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12509 }
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12510
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12511 /*
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12512 * Converts a wide string into a UTF-8 encoded string.
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12513 * Parameters:
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12514 * wstring: Wide source string.
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12515 * Returns:
1784 86ace55df07b Added UTF8/Wide conversion functions on OS/2 and Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1783 diff changeset	12516 * UTF-8 encoded string that needs to be freed with dw_free()
86ace55df07b Added UTF8/Wide conversion functions on OS/2 and Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1783 diff changeset	12517 * or NULL on failure.
1783 9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12518 */
2035 ea303d356419 Mac: Const changes to match the Windows changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2032 diff changeset	12519 char * API dw_wchar_to_utf8(const wchar_t *wstring)
1783 9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12520 {
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12521 size_t bufflen = 8 * wcslen(wstring) + 1;
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12522 char *temp = malloc(bufflen);
1784 86ace55df07b Added UTF8/Wide conversion functions on OS/2 and Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1783 diff changeset	12523 if(temp)
86ace55df07b Added UTF8/Wide conversion functions on OS/2 and Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1783 diff changeset	12524 wcstombs(temp, wstring, bufflen);
1783 9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12525 return temp;
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12526 }

Mercurial > dwindows

annotate mac/dw.m @ 2067:3ccd0da07514