dwindows: mac/dw.m annotate

annotate mac/dw.m @ 2032:5ca399fb2d6f

Mac: Put back the delayed setNeedsDisplay workaround for Mojave only.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Fri, 15 Nov 2019 04:26:18 +0000
parents	c4fc33d70a8e
children	ea303d356419

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 *
1938 5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	5 * (C) 2011-2019 Brian Smith <brian@dbsoft.org>
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
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	35 /* 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	36 #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	37 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	38 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	39 #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	40
1904 2e456850e027 Minor fix for that last commit... code actually works now. ;) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1903 diff changeset	41 /* 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	42 * 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	43 */
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	44 #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	45 #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	46 #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	47 #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	48 #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	49 #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	50 #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	51 #define DWCalendarIdentifierGregorian NSCalendarIdentifierGregorian
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	52 #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	53 #else
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	54 #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	55 #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	56 #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	57 #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	58 #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	59 #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	60 #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	61 #endif
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	62
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	63 /* 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	64 * 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	65 */
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	66 #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	67 #define DWButtonTypeSwitch NSButtonTypeSwitch
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	68 #define DWButtonTypeRadio NSButtonTypeRadio
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	69 #define DWButtonTypeMomentaryPushIn NSButtonTypeMomentaryPushIn
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	70 #define DWBezelStyleRegularSquare NSBezelStyleRegularSquare
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	71 #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	72 #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	73 #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	74 #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	75 #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	76 #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	77 #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	78 #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	79 #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	80 #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	81 #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	82 #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	83 #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	84 #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	85 #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	86 #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	87 #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	88 #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	89 #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	90 #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	91 #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	92 #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	93 #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	94 #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	95 #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	96 #define DWWindowStyleMaskResizable NSWindowStyleMaskResizable
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	97 #define BUILDING_FOR_SIERRA
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	98 #else
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	99 #define DWButtonTypeSwitch NSSwitchButton
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	100 #define DWButtonTypeRadio NSRadioButton
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	101 #define DWButtonTypeMomentaryPushIn NSMomentaryPushInButton
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	102 #define DWBezelStyleRegularSquare NSRegularSquareBezelStyle
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	103 #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	104 #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	105 #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	106 #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	107 #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	108 #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	109 #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	110 #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	111 #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	112 #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	113 #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	114 #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	115 #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	116 #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	117 #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	118 #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	119 #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	120 #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	121 #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	122 #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	123 #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	124 #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	125 #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	126 #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	127 #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	128 #define DWWindowStyleMaskResizable NSResizableWindowMask
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	129 #endif
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	130
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	131 /* 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	132 * 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	133 */
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	134 #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	135 #define DWControlStateValueOff NSControlStateValueOff
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	136 #define DWControlStateValueOn NSControlStateValueOn
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	137 #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	138 #else
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	139 #define DWControlStateValueOff NSOffState
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	140 #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	141 #endif
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	142
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	143 /* 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	144 * 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	145 */
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	146 #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	147 #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	148 #define BUILDING_FOR_MOJAVE
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 #else
1941 b498fb0360fc Mac: 10.14 seems to have drastically changed the drawing mechanism. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1940 diff changeset	150 #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	151 #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	152
1994 4c53c8367a12 Mac: Some minor code cleanup in the SDK section. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1993 diff changeset	153 /* 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	154 #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	155 #define BUILDING_FOR_CATALINA
e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	156 #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	157 #endif
e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	158
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	159 /* 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	160 * 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	161 */
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	162 #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	163 #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	164 #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	165 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	166 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	167 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	168 [_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	169 #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	170 #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	171 [_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	172 #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	173 [_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	174 [_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	175 #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	176 [_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	177 [_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	178 [_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	179 #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	180 [_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	181 [_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	182 [_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	183 [_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	184 #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	185 [_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 [_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	191 #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	192 [_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	193 [_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	194 [_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	195 [_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	196 [_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	197 [_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	198 [_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	199 #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	200 [_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	201 [_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	202 [_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	203 [_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	204 [_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	205 [_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	206 [_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	207 [_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	208 #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	209 [_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	210 [_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	211 [_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	212 [_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	213 [_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	214 [_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	215 [_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	216 [_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	217 [_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	218 #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	219 #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	220 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	221 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	222 #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	223 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	224 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	225 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	226 #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	227 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	228 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	229 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	230 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	231 #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	232 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	233 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	234 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	235 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	236 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	237 #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	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 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	244 #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	245 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	246 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	247 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	248 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	249 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	250 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	251 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	252 #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	253 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	254 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	255 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	256 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	257 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	258 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	259 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	260 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	261 #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	262 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	263 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	264 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	265 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	266 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	267 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	268 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	269 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	270 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	271 #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	272 #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	273 [_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	274 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	275 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	276 #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	277 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	278 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	279 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	280 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	281 [_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	282 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	283 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	284 #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	285 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	286 [_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	287 #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	288 #else
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	289 /* 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	290 #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	291 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	292 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	293 _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	294 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	295 [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	296 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	297 _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	298 #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	299 #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	300 #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	301 #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	302 #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	303 #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	304 #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	305 #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	306 #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	307 #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	308 #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	309 #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	310 #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	311 #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	312 #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	313 #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	314 #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	315 #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	316 #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	317 #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	318 #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	319 #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	320 #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	321 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	322 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	323 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	324 _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	325 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	326 _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	327 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	328 #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	329 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	330 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	331 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	332 _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	333 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	334 _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	335 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	336 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	337 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	338 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	339 #endif
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	340
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	341 unsigned long _colors[] =
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	342 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	343 0x00000000, /* 0 black */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	344 0x000000bb, /* 1 red */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	345 0x0000bb00, /* 2 green */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	346 0x0000aaaa, /* 3 yellow */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	347 0x00cc0000, /* 4 blue */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	348 0x00bb00bb, /* 5 magenta */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	349 0x00bbbb00, /* 6 cyan */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	350 0x00bbbbbb, /* 7 white */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	351 0x00777777, /* 8 grey */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	352 0x000000ff, /* 9 bright red */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	353 0x0000ff00, /* 10 bright green */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	354 0x0000eeee, /* 11 bright yellow */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	355 0x00ff0000, /* 12 bright blue */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	356 0x00ff00ff, /* 13 bright magenta */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	357 0x00eeee00, /* 14 bright cyan */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	358 0x00ffffff, /* 15 bright white */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	359 0xff000000 /* 16 default color */
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	360 };
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	361
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	362 /*
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	363 * 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	364 */
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	365 #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	366 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	367 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	368 ".png",
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	369 ".ico",
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	370 ".icns",
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	371 ".gif",
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	372 ".jpg",
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	373 ".jpeg",
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	374 ".tiff",
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	375 ".bmp"
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	376 };
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	377
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	378 char _dw_get_image_extension( char filename )
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	379 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	380 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	381 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	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 /* 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	384 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	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 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	387 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	388 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	389 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	390 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	391 break;
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	392 }
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	393 }
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 ( 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	395 {
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	396 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	397 }
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	398 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	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
1958 45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	401 /* 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	402 unsigned long _get_color(unsigned long thiscolor)
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	403 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	404 if(thiscolor & DW_RGB_COLOR)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	405 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	406 return thiscolor & ~DW_RGB_COLOR;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	407 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	408 else if(thiscolor < 17)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	409 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	410 return _colors[thiscolor];
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 0;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	413 }
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	414
1958 45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	415 /* 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	416 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	417 {
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	418 #ifdef BUILDING_FOR_MOJAVE
1984 09a102c92788 Mac: Fix building on MacOS 10.7 Lion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1983 diff changeset	419 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	420
1958 45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	421 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	422 {
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	423 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	424 NSAppearanceNameAqua,
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	425 NSAppearanceNameDarkAqua]];
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	426 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	427 }
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	428 #endif
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	429 return NO;
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	430 }
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	431
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	432 /* 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	433 #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	434 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	435 #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	436 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	437 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	438 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	439 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	440
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 /* 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	442 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	443 {
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	444 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	445 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	446 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	447 }
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
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	449 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	450 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	451 struct _sighandler *next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	452 ULONG message;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	453 HWND window;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	454 int id;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	455 void *signalfunction;
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	456 void *discfunction;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	457 void *data;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	458
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	459 } SignalHandler;
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	460
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	461 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	462
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	463 /* Some internal prototypes */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	464 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	465 void _handle_resize_events(Box *thisbox);
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	466 int _remove_userdata(UserData *root, 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	467 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	468 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	469 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	470
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	471 /* 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	472 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	473 {
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	474 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	475 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	476
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	477 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	478 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	479
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	480 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	481 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	482 {
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	483 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	484 }
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	485 }
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	486
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	487 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	488 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	489 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	490
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	491 /* Find any callbacks for this function */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	492 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	493 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	494 if(tmp->message == messageid && window == tmp->window)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	495 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	496 return tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	497 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	498 tmp = tmp->next;
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 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	501 }
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	502
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	503 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	504 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	505 ULONG message;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	506 char name[30];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	507
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	508 } SignalList;
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	509
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	510 /* 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	511 #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	512
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	513 SignalList SignalTranslate[SIGNALMAX] = {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	514 { 1, DW_SIGNAL_CONFIGURE },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	515 { 2, DW_SIGNAL_KEY_PRESS },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	516 { 3, DW_SIGNAL_BUTTON_PRESS },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	517 { 4, DW_SIGNAL_BUTTON_RELEASE },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	518 { 5, DW_SIGNAL_MOTION_NOTIFY },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	519 { 6, DW_SIGNAL_DELETE },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	520 { 7, DW_SIGNAL_EXPOSE },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	521 { 8, DW_SIGNAL_CLICKED },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	522 { 9, DW_SIGNAL_ITEM_ENTER },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	523 { 10, DW_SIGNAL_ITEM_CONTEXT },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	524 { 11, DW_SIGNAL_LIST_SELECT },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	525 { 12, DW_SIGNAL_ITEM_SELECT },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	526 { 13, DW_SIGNAL_SET_FOCUS },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	527 { 14, DW_SIGNAL_VALUE_CHANGED },
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	528 { 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	529 { 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	530 { 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	531 { 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	532 { 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	533 };
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	534
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	535 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	536 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	537 SignalHandler *handler = _get_handler(object, message);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	538 /* 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	539
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	540 if(handler)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	541 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	542 switch(message)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	543 {
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	544 /* Timer event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	545 case 0:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	546 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	547 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	548
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	549 if(!timerfunc(handler->data))
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	550 dw_timer_disconnect(handler->id);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	551 return 0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	552 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	553 /* Configure/Resize event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	554 case 1:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	555 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	556 int (sizefunc)(HWND, int, int, void ) = handler->signalfunction;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	557 NSSize size;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	558
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	559 if([object isKindOfClass:[NSWindow class]])
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	560 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	561 NSWindow *window = object;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	562 size = [[window contentView] frame].size;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	563 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	564 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	565 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	566 NSView *view = object;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	567 size = [view frame].size;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	568 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	569
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	570 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	571 {
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	572 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	573 }
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	574 return 0;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	575 }
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	576 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	577 {
1748 e4fcd1e81f0d Added optional utf8 parameter to keypress callback on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1744 diff changeset	578 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	579 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	580 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	581 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	582 char *utf8 = NULL, ch = '\0';
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	583
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	584 /* 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	585 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	586 {
1748 e4fcd1e81f0d Added optional utf8 parameter to keypress callback on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1744 diff changeset	587 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	588 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	589 {
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 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	591 }
1748 e4fcd1e81f0d Added optional utf8 parameter to keypress callback on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1744 diff changeset	592 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	593 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	594
1748 e4fcd1e81f0d Added optional utf8 parameter to keypress callback on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1744 diff changeset	595 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	596 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	597 /* Button press and release event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	598 case 3:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	599 case 4:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	600 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	601 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	602 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	603 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	604
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	605 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	606 {
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	607 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	608 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	609
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	610 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	611
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	612 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	613 {
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 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	615 }
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	616 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	617 {
aac69b11e821 Fix to get button press events working from the task/statusbar on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1220 diff changeset	618 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	619 }
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	620 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	621 {
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	622 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	623 }
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	624 }
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	625
954 cfb12bf3bb06 Fixes for some more coordinate system issues on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 953 diff changeset	626 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	627 }
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	628 /* 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	629 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	630 {
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	631 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	632 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	633 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	634 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	635 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	636 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	637
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	638 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	639 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	640 /* Window close event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	641 case 6:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	642 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	643 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	644 return closefunc(object, handler->data);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 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 expose/draw event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	647 case 7:
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 DWExpose exp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	650 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	651 NSRect rect = [object frame];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	652
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	653 exp.x = rect.origin.x;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	654 exp.y = rect.origin.y;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	655 exp.width = rect.size.width;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	656 exp.height = rect.size.height;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	657 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	658 #ifndef BUILDING_FOR_MOJAVE
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	659 [[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	660 #endif
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	661 return result;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	662 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	663 /* Clicked event for buttons and menu items */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	664 case 8:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	665 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	666 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	667
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	668 return clickfunc(object, handler->data);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	669 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	670 /* 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	671 case 9:
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	672 {
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	673 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	674 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	675
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	676 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	677 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	678 /* Container context menu event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	679 case 10:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	680 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	681 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	682 char text = (char )event;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	683 void *user = NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	684 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	685
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	686 /* 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	687 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	688 {
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	689 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	690 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	691 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	692 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	693 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	694 {
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	695 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	696 }
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 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	698
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	699 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	700
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	701 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	702 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	703 /* 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	704 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	705 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	706 {
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	707 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	708 int selected = DW_POINTER_TO_INT(event);
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	709
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	710 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	711 }
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	712 /* Tree class selection event */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	713 case 12:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	714 {
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	715 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	716 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	717 void *user = NULL;
5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	718 id item = nil;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	719
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	720 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	721 {
5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	722 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	723 NSString *nstr = [item objectAtIndex:1];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	724
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	725 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	726 {
01107d8e033e Fixed the scrollbar maximum range to be correct. Also added some MLE code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 711 diff changeset	727 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	728 }
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	729
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	730 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	731 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	732 {
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	733 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	734 }
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	735 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	736 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	737 {
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	738 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	739 }
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	740 return result;
5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	741 }
1874 71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	742 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	743 {
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	744 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	745
1874 71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	746 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	747 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	748 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	749
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	750 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	751 }
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	752 /* 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	753 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	754 {
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	755 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	756
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	757 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	758 }
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	759 /* 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	760 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	761 {
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	762 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	763 int pageid = DW_POINTER_TO_INT(event);
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	764
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	765 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	766 }
2013 7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	767 /* Tree expand event */
722 5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	768 case 16:
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	769 {
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	770 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	771
722 5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	772 return treeexpandfunc(handler->window, (HTREEITEM)event, handler->data);
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	773 }
2013 7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	774 /* 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	775 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	776 {
2013 7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	777 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	778 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	779
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	780 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	781 }
2013 7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	782 /* 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	783 case 18:
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	784 {
2014 b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	785 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	786 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	787 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	788
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	789 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	790 }
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	791 /* 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	792 case 19:
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	793 {
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	794 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	795 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	796 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	797
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	798 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	799 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	800 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	801 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	802 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	803 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	804
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	805 /* Sub function to handle redraws */
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	806 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	807 {
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	808 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	809 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	810 _dw_redraw(nil, FALSE);
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	811 return ret;
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	812 }
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	813
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	814 /* Subclass for the Timer type */
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	815 @interface DWTimerHandler : NSObject { }
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	816 -(void)runTimer:(id)sender;
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	817 @end
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	818
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	819 @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	820 -(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	821 @end
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	822
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	823 NSApplication *DWApp;
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	824 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	825 NSFont *DWDefaultFont;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	826 DWTimerHandler *DWHandler;
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	827 #if !defined(GARBAGE_COLLECT)
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	828 NSAutoreleasePool *pool;
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	829 #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	830 #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	831 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	832 #else
661 eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	833 HWND _DWLastDrawable;
1949 c71e5da5b801 Mac: Fix mojave #ifdefs so it builds pre-mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1948 diff changeset	834 #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	835 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	836
1558 9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	837 /* 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	838 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	839 {
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	840 [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	841 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	842 modifierFlags:0
9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	843 timestamp:0
9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	844 windowNumber:0
9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	845 context:NULL
9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	846 subtype:0
9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	847 data1:0
9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	848 data2:0]
9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	849 atStart:NO];
9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	850 }
9c5d3ac5bec5 Attempted fix on Mac for 10.5 menu event delay issue. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1557 diff changeset	851
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	852 /* 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	853 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	854 {
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	855 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	856 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	857 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	858 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	859 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	860 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	861 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	862 int ysrc;
1247 93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	863 int srcwidth;
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	864 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	865 } DWBitBlt;
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	866
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	867 /* 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	868 @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	869 -(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	870 #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	871 -(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	872 #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	873 -(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	874 -(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	875 -(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	876 @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	877
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	878 @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	879 {
1517 6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	880 int check;
6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	881 }
6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	882 -(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	883 -(int)check;
6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	884 -(void)dealloc;
6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	885 @end
6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	886
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	887 /* 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	888 * 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	889 * basically everything. Was hoping to add methods
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	890 * 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	891 * 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	892 * going to work. -Brian
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	893 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	894
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	895 /* Subclass for a box type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	896 @interface DWBox : NSView
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	897 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	898 Box *box;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	899 void *userdata;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	900 NSColor *bgcolor;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	901 }
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	902 -(id)init;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	903 -(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	904 -(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	905 -(id)contentView;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	906 -(void *)userdata;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	907 -(void)setUserdata:(void *)input;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	908 -(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	909 -(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	910 -(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	911 -(void)mouseUp:(NSEvent *)theEvent;
701 c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	912 -(NSMenu )menuForEvent:(NSEvent )theEvent;
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	913 -(void)rightMouseUp:(NSEvent *)theEvent;
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	914 -(void)otherMouseDown:(NSEvent *)theEvent;
c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	915 -(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	916 -(void)keyDown:(NSEvent *)theEvent;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	917 -(void)setColor:(unsigned long)input;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	918 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	919
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	920 @implementation DWBox
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	921 -(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	922 {
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	923 self = [super init];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	924
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	925 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	926 {
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	927 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	928 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	929 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	930 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	931 }
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	932 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	933 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	934 -(void)dealloc
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	935 {
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	936 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	937 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	938 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	939 free(box);
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	940 _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	941 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	942 [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	943 }
e426de6e6c7c Changes to make the resize function more like on the other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 665 diff changeset	944 -(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	945 -(id)contentView { return self; }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	946 -(void *)userdata { return userdata; }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	947 -(void)setUserdata:(void *)input { userdata = input; }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	948 -(void)drawRect:(NSRect)rect
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	949 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	950 if(bgcolor)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	951 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	952 [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	953 NSRectFill([self bounds]);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	954 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	955 }
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	956 -(BOOL)isFlipped { return YES; }
701 c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	957 -(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	958 -(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	959 -(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	960 -(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	961 -(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	962 -(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	963 -(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	964 -(void)setColor:(unsigned long)input
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	965 {
755 f574028932cc Fix for crash when changing background colors, needed retain and release. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 754 diff changeset	966 id orig = bgcolor;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	967
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	968 if(input == _colors[DW_CLR_DEFAULT])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	969 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	970 bgcolor = nil;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	971 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	972 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	973 {
755 f574028932cc Fix for crash when changing background colors, needed retain and release. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 754 diff changeset	974 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	975 [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	976 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	977 }
68f923e57542 Attempt at resetting default colors with DW_CLR_DEFAULT on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1843 diff changeset	978 [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	979 [orig release];
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	980 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	981 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	982
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	983 /* 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	984 @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	985 {
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	986 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	987 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	988 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	989 }
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	990 -(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	991 -(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	992 -(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	993 @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	994
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 @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	996 -(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	997 -(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	998 -(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	999 -(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	1000 {
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	1001 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	1002
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	1003 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	1004 {
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	1005 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	1006 [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	1007 }
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	1008 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	1009 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	1010
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	1011 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	1012 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	1013 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	1014 }
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	1015 -(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	1016 @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	1017
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	1018 @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	1019 {
d7eafaa054ab Added support for dw_window_redraw() causing splitbar panes to redraw without bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1100 diff changeset	1020 int redraw;
1489 4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	1021 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	1022 }
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	1023 -(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	1024 -(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	1025 -(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	1026 -(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	1027 -(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	1028 -(int)shown;
4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	1029 -(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	1030 @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	1031
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	1032 @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	1033 -(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	1034 {
1133 25bea6526ca1 Similar Mac fix to what I just commited on Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1130 diff changeset	1035 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	1036 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	1037 {
ab73d0269a5b Ensure default keypress event is not processed if handler returns 1 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1128 diff changeset	1038 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	1039 }
1133 25bea6526ca1 Similar Mac fix to what I just commited on Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1130 diff changeset	1040 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	1041 [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	1042 }
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	1043 -(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	1044 -(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	1045 -(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	1046 -(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	1047 -(int)shown { return shown; }
4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	1048 -(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	1049 -(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	1050 @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	1051
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	1052 /* 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	1053 @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	1054 {
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	1055 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	1056 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	1057 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	1058 #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	1059 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	1060 #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	1061 }
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 -(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	1063 -(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	1064 -(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	1065 -(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	1066 -(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	1067 -(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	1068 #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	1069 -(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	1070 #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	1071 -(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	1072 -(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	1073 -(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	1074 -(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	1075 -(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	1076 -(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	1077 -(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	1078 -(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	1079 -(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	1080 @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	1081
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 @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	1083 -(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	1084 -(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	1085 -(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	1086 -(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	1087 -(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	1088 size = input;
1949 c71e5da5b801 Mac: Fix mojave #ifdefs so it builds pre-mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1948 diff changeset	1089 #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	1090 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	1091 {
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	1092 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	1093 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	1094 [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	1095 [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	1096 }
1949 c71e5da5b801 Mac: Fix mojave #ifdefs so it builds pre-mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1948 diff changeset	1097 #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	1098 }
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	1099 -(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	1100 #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	1101 -(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	1102 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	1103 {
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	1104 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	1105 [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	1106 }
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	1107 /* 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	1108 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	1109 [_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	1110 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	1111 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1112 #endif
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1113 -(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	1114 {
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	1115 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	1116 _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	1117 }
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	1118 -(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	1119 -(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	1120 -(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	1121 -(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	1122 -(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	1123 -(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	1124 -(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	1125 -(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	1126 _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	1127 #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	1128 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	1129 {
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	1130 [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	1131 [_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	1132 /* 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	1133 if(DWOSMinor != 14)
5ca399fb2d6f Mac: Put back the delayed setNeedsDisplay workaround for Mojave only. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2031 diff changeset	1134 [self setNeedsDisplay:YES];
5ca399fb2d6f Mac: Put back the delayed setNeedsDisplay workaround for Mojave only. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2031 diff changeset	1135 else
5ca399fb2d6f Mac: Put back the delayed setNeedsDisplay workaround for Mojave only. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2031 diff changeset	1136 [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	1137 }
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	1138 #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	1139 }
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	1140 -(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	1141 -(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	1142 -(void)dealloc {
3aef9be654ce Mac: Fix pre-mojave build, cached render image not available. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1946 diff changeset	1143 UserData *root = userdata;
3aef9be654ce Mac: Fix pre-mojave build, cached render image not available. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1946 diff changeset	1144 _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	1145 [font release];
3aef9be654ce Mac: Fix pre-mojave build, cached render image not available. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1946 diff changeset	1146 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	1147 #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	1148 [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	1149 [_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	1150 #endif
3aef9be654ce Mac: Fix pre-mojave build, cached render image not available. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1946 diff changeset	1151 [super dealloc];
3aef9be654ce Mac: Fix pre-mojave build, cached render image not available. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1946 diff changeset	1152 }
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	1153 -(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	1154 @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	1155
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	1156 @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	1157 -(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	1158 #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	1159 -(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	1160 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1161 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	1162 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	1163 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	1164 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	1165 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	1166 #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	1167 -(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	1168 {
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 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	1170 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	1171 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1172 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	1173 [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	1174 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	1175 [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	1176 }
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 _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	1178 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	1179 #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	1180 -(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	1181 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	1182 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	1183 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	1184 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	1185 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	1186 #endif
1985 8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	1187 -(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	1188 {
8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	1189 NSInteger iResponse;
8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	1190 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	1191 [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	1192 [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	1193 [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	1194 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	1195 [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	1196 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	1197 [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	1198 [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	1199 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	1200 [alert release];
8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	1201 [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	1202 }
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	1203 -(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	1204 {
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	1205 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	1206 {
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	1207 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	1208
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 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	1210 {
1993 e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	1211 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	1212
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	1213 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	1214 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	1215 }
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 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	1217 [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	1218 }
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 }
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	1220 -(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	1221 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1222 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	1223 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	1224 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	1225 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	1226
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	1227 #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	1228 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	1229 {
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 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	1231
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	1232 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	1233 }
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 #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	1235 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	1236 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1237 [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	1238 [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	1239 [[[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	1240 }
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 #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	1242 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	1243 {
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 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	1245 {
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 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	1247 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	1248 }
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 _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	1250 }
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 #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	1252 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	1253 {
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 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	1255 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	1256 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	1257 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	1258
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	1259 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	1260 {
1993 e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	1261 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	1262 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	1263 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1264 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	1265 {
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 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	1267 [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	1268 }
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 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	1270 {
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 [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	1272 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	1273 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	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 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	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 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	1278 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	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 [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	1282 [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	1283 }
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 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	1285 {
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 [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	1287 }
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 #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	1289 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	1290 {
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 [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	1292 }
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 #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	1294 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	1295 }
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 -(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	1297 {
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	1298 #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	1299 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	1300 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	1301
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	1302 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	1303 [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	1304 [_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	1305 #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	1306 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	1307 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1308 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	1309 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	1310 [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	1311 _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	1312 }
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 #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	1314 }
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 -(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	1316 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1317 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	1318 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	1319 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	1320
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	1321 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	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 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	1324 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	1325 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	1326 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	1327 }
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 }
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 @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	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 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	1333
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	1334 /* 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	1335 @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	1336 #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	1337 <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	1338 #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	1339 {
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 }
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 -(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	1342 @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	1343
2013 7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1344 /* 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	1345 * 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	1346 * 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	1347 */
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1348 #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	1349 @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	1350 {
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	1351 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	1352 }
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	1353 -(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	1354 -(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	1355 -(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	1356 -(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	1357 -(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	1358 -(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	1359 @end
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1360
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	1361 @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	1362 -(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	1363 -(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	1364 -(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	1365 {
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1366 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	1367 _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	1368 }
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1369 -(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	1370 {
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1371 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	1372 _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	1373 }
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1374 -(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	1375 {
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1376 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	1377 _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	1378 }
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1379 -(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	1380 {
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1381 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	1382 _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	1383 }
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	1384 -(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	1385 @end
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1386 #else
2014 b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1387 @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	1388 {
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	1389 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	1390 }
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	1391 -(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	1392 -(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	1393 -(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	1394 -(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	1395 -(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	1396 @end
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1397
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	1398 @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	1399 -(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	1400 -(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	1401 -(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	1402 {
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1403 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	1404 _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	1405 }
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1406 -(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	1407 {
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1408 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	1409 _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	1410 }
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1411 -(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	1412 {
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	1413 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	1414 _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	1415 }
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	1416 -(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	1417 @end
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1418 #endif
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1419
7303b35a9f4d Mac: Added DW_SIGNAL_HTML support on Mac when using WKWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2012 diff changeset	1420
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	1421 @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	1422 -(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	1423 {
2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	1424 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	1425 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	1426 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	1427 }
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 @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	1429
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1430 /* Subclass for a top-level window */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1431 @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	1432 #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	1433 <NSWindowDelegate>
d44bb4c4902d Fixed an error on the close event handler on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 853 diff changeset	1434 #endif
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1435 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1436 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	1437 NSSize oldsize;
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1438 }
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	1439 -(BOOL)windowShouldClose:(id)sender;
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1440 -(void)setMenu:(NSMenu *)input;
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1441 -(void)windowDidBecomeMain:(id)sender;
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1442 -(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	1443 -(void)mouseDragged:(NSEvent *)theEvent;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1444 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1445
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1446 @implementation DWView
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1447 -(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	1448 {
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	1449 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	1450 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	1451 return YES;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1452 }
1862 9c7485b1921c Fixed object/signal/memory leak on Mac when destroying bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	1453 -(void)viewDidMoveToWindow
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1454 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1455 [[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	1456 [[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	1457 }
1862 9c7485b1921c Fixed object/signal/memory leak on Mac when destroying bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	1458 -(void)dealloc
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1459 {
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	1460 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	1461 {
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	1462 [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	1463 }
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	1464 [[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	1465 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	1466 [super dealloc];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1467 }
1862 9c7485b1921c Fixed object/signal/memory leak on Mac when destroying bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	1468 -(void)windowResized:(NSNotification *)notification;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1469 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1470 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	1471
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	1472 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	1473 {
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	1474 _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	1475 _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	1476 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	1477 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	1478 _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	1479 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1480 }
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	1481 -(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	1482 {
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	1483 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	1484
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	1485 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	1486 {
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 _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	1488 _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	1489 }
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 }
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1492 -(void)windowDidBecomeMain:(id)sender
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	1493 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1494 if(windowmenu)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1495 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1496 [DWApp setMainMenu:windowmenu];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1497 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1498 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1499 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1500 [DWApp setMainMenu:DWMainMenu];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1501 }
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	1502 _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	1503 }
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	1504 -(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	1505 -(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	1506 {
19af25f71e1f Yet another fix attempt for mene item issues on Mac 10.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1590 diff changeset	1507 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	1508
19af25f71e1f Yet another fix attempt for mene item issues on Mac 10.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1590 diff changeset	1509 /* 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	1510 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	1511 {
19af25f71e1f Yet another fix attempt for mene item issues on Mac 10.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1590 diff changeset	1512 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	1513 }
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 /* 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	1516 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	1517 [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	1518 else
19af25f71e1f Yet another fix attempt for mene item issues on Mac 10.5. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1590 diff changeset	1519 [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	1520 _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	1521 }
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	1522 -(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	1523 -(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	1524 {
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	1525 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	1526
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	1527 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	1528 {
abb9203adc05 Use NSCompositeSourceOver for bitblting that respects transparency of the source mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 951 diff changeset	1529 _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	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 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1532 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1533
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1534 /* Subclass for a button type */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1535 @interface DWButton : NSButton
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1536 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1537 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	1538 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	1539 DWBox *parent;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1540 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1541 -(void *)userdata;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1542 -(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	1543 -(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	1544 -(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	1545 -(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	1546 -(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	1547 -(DWBox *)parent;
1849 b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1548 -(NSColor *)textColor;
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1549 -(void)setTextColor:(NSColor *)textColor;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1550 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1551
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1552 @implementation DWButton
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1553 -(void *)userdata { return userdata; }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1554 -(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	1555 -(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	1556 {
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	1557 _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	1558 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	1559 {
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	1560 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	1561 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	1562 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	1563
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	1564 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	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 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	1567 {
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 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	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 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	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 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	1573
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	1574 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	1575 {
1938 5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	1576 [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	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 }
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	1579 }
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	1580 }
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 }
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	1582 }
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 -(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	1584 -(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	1585 -(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	1586 -(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	1587 -(NSColor *)textColor
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1588 {
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1589 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	1590 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	1591 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	1592 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	1593 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	1594 if (attrs) {
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1595 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	1596 }
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1597 return textColor;
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1598 }
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1599 -(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	1600 {
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1601 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	1602 initWithAttributedString:[self attributedTitle]];
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1603 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	1604 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	1605 [attrTitle addAttribute:NSForegroundColorAttributeName
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1606 value:textColor
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1607 range:range];
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1608 [attrTitle fixAttributesInRange:range];
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1609 [self setAttributedTitle:attrTitle];
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1610 [attrTitle release];
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	1611 }
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	1612 -(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	1613 {
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	1614 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	1615 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	1616 {
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	1617 if(buttonType == DWButtonTypeSwitch)
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	1618 [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	1619 else if(buttonType == DWButtonTypeRadio)
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	1620 [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	1621 [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	1622 }
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	1623 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	1624 {
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	1625 [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	1626 [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	1627 }
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 -(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	1630 -(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	1631 -(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	1632 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1633
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1634 /* Subclass for a progress type */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1635 @interface DWPercent : NSProgressIndicator
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1636 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1637 void *userdata;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1638 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1639 -(void *)userdata;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1640 -(void)setUserdata:(void *)input;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1641 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1642
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1643 @implementation DWPercent
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1644 -(void *)userdata { return userdata; }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1645 -(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	1646 -(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	1647 @end
c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	1648
c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	1649 /* 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	1650 @implementation DWMenuItem
1517 6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	1651 -(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	1652 -(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	1653 -(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	1654 @end
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1655
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	1656 /* 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	1657 @interface DWScrollBox : NSScrollView
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	1658 {
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	1659 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	1660 id box;
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	1661 }
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	1662 -(void *)userdata;
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	1663 -(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	1664 -(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	1665 -(id)box;
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	1666 @end
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 @implementation DWScrollBox
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	1669 -(void *)userdata { return userdata; }
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	1670 -(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	1671 -(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	1672 -(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	1673 -(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	1674 @end
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	1675
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1676 /* 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	1677 @interface DWTextFieldCell : NSTextFieldCell
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1678 {
860 93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	1679 BOOL vcenter;
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1680 }
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1681 -(NSRect)drawingRectForBounds:(NSRect)theRect;
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1682 -(void)setVCenter:(BOOL)input;
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1683 @end
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1684
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1685 @implementation DWTextFieldCell
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1686 -(NSRect)drawingRectForBounds:(NSRect)theRect
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1687 {
860 93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	1688 /* Get the parent's idea of where we should draw */
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	1689 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	1690
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1691 /* If we are being vertically centered */
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1692 if(vcenter)
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1693 {
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1694 /* Get our ideal size for current text */
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1695 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	1696
860 93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	1697 /* Center that in the proposed rect */
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	1698 float heightDelta = newRect.size.height - textSize.height;
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	1699 if (heightDelta > 0)
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	1700 {
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	1701 newRect.size.height -= heightDelta;
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	1702 newRect.origin.y += (heightDelta / 2);
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	1703 }
93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	1704 }
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1705
860 93ac372941c4 Formatting cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 859 diff changeset	1706 return newRect;
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1707 }
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1708 -(void)setVCenter:(BOOL)input { vcenter = input; }
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1709 @end
80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	1710
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1711 @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	1712 {
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1713 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	1714 }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1715 - (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	1716 - (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	1717 @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	1718
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1719 /* 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	1720 * 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	1721 */
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 @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	1723 -(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	1724 {
1063 2ebaea72ac95 Fix for some release calls causing issues on MacOS 10.7 Lion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1061 diff changeset	1725 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	1726 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	1727 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	1728 }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1729 -(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	1730 -(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	1731 -(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	1732 -(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	1733 -(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	1734 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	1735 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	1736 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	1737 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	1738 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1739 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	1740 {
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 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	1742 }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1743 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	1744 }
29d8ae25a78c Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 886 diff changeset	1745 -(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	1746 @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	1747
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1748 /* Subclass for a entryfield type */
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1749 @interface DWEntryField : NSTextField
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1750 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1751 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	1752 id clickDefault;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1753 }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1754 -(void *)userdata;
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1755 -(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	1756 -(void)setClickDefault:(id)input;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1757 @end
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1758
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1759 @implementation DWEntryField
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1760 -(void *)userdata { return userdata; }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1761 -(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	1762 -(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	1763 -(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	1764 {
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	1765 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	1766 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	1767 {
1236 46de4dbe710d Fixed clickdefault not triggering event for buttons on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1235 diff changeset	1768 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	1769 [clickDefault buttonClicked:self];
46de4dbe710d Fixed clickdefault not triggering event for buttons on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1235 diff changeset	1770 else
46de4dbe710d Fixed clickdefault not triggering event for buttons on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1235 diff changeset	1771 [[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	1772 } else
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1773 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1774 [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	1775 }
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	1776 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1777 -(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	1778 {
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	1779 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	1780 {
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1781 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	1782 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	1783 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	1784 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	1785 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	1786 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	1787 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	1788 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	1789 }
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1790 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	1791 }
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	1792 -(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	1793 @end
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1794
1564 d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1795 /* 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	1796 @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	1797 {
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1798 void *userdata;
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1799 id clickDefault;
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1800 }
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1801 -(void *)userdata;
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1802 -(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	1803 @end
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1804
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1805 @implementation DWText
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	1806 -(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	1807 -(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	1808 -(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	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
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1812 /* Subclass for a entryfield password type */
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1813 @interface DWEntryFieldPassword : NSSecureTextField
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1814 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1815 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	1816 id clickDefault;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1817 }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1818 -(void *)userdata;
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1819 -(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	1820 -(void)setClickDefault:(id)input;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1821 @end
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1822
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1823 @implementation DWEntryFieldPassword
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1824 -(void *)userdata { return userdata; }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1825 -(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	1826 -(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	1827 -(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	1828 {
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	1829 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	1830 {
1236 46de4dbe710d Fixed clickdefault not triggering event for buttons on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1235 diff changeset	1831 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	1832 [clickDefault buttonClicked:self];
46de4dbe710d Fixed clickdefault not triggering event for buttons on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1235 diff changeset	1833 else
46de4dbe710d Fixed clickdefault not triggering event for buttons on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1235 diff changeset	1834 [[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	1835 }
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1836 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	1837 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	1838 [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	1839 }
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	1840 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1841 -(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	1842 {
1983 59146d14e21e Mac: Fix building for MacOS 10.10 Yosemite. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1974 diff changeset	1843 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	1844 {
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1845 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	1846 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	1847 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	1848 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	1849 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	1850 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	1851 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	1852 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	1853 }
9327f684c9b8 Attempt at fixing Copy, Cut, Paste, Select All Mac key combos... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1234 diff changeset	1854 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	1855 }
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	1856 -(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	1857 @end
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	1858
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1859 /* Subclass for a Notebook control type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1860 @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	1861 #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	1862 <NSTabViewDelegate>
17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	1863 #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	1864 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1865 void *userdata;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1866 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	1867 }
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1868 -(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	1869 -(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	1870 -(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	1871 -(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	1872 -(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	1873 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1874
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1875 /* 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	1876 @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	1877 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1878 void *userdata;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1879 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	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 -(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	1882 -(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	1883 -(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	1884 -(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	1885 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1886
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	1887 @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	1888 -(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	1889 -(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	1890 -(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	1891 -(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	1892 -(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	1893 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1894 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	1895 DWNotebookPage page = (DWNotebookPage )notepage;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	1896
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1897 if([object isMemberOfClass:[DWBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1898 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1899 DWBox *view = object;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1900 Box *box = [view box];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1901 NSSize size = [view frame].size;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1902 _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	1903 _handle_resize_events(box);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1904 }
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	1905 _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	1906 }
1808 f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1907 -(void)keyDown:(NSEvent *)theEvent
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1908 {
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1909 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	1910
1809 5efaea897310 Fixed back tab handling for certain controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1808 diff changeset	1911 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	1912 [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	1913 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	1914 {
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1915 NSArray *pages = [self tabViewItems];
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1916 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	1917 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	1918
1808 f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1919 if(index != NSNotFound)
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 if(index > 0)
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1922 [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	1923 else
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1924 [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	1925
1808 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 }
1809 5efaea897310 Fixed back tab handling for certain controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1808 diff changeset	1928 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	1929 {
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1930 NSArray *pages = [self tabViewItems];
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1931 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	1932 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	1933 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	1934
1808 f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1935 if(index != NSNotFound)
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1936 {
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1937 if(index + 1 < count)
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1938 [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	1939 else
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1940 [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	1941
1808 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 }
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1944 [super keyDown:theEvent];
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1945 }
f3458cd6277c Added keyboard support to the notebook control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1807 diff changeset	1946 -(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	1947 -(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	1948 -(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	1949 @end
329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	1950
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1951 @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	1952 -(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	1953 -(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	1954 -(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	1955 -(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	1956 -(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	1957 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1958
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1959 /* Subclass for a color chooser type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	1960 @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	1961 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	1962 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	1963 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	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 -(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	1966 -(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	1967 -(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	1968 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1969
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1970 @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	1971 -(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	1972 {
1644 2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	1973 if(!dialog)
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	1974 [self close];
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	1975 else
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1976 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	1977 }
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1978 -(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	1979 {
1644 2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	1980 if(dialog)
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	1981 {
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1982 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	1983 dialog = nil;
1644 2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	1984 dw_dialog_dismiss(d, pickedcolor);
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	1985 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1986 [self close];
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	1987 return NO;
1644 2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	1988 }
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1989 -(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	1990 -(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	1991 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	1992
1050 48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	1993 /* 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	1994 @interface DWFontChoose : NSFontPanel
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	1995 {
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	1996 DWDialog *dialog;
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	1997 NSFontManager *fontManager;
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	1998 }
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	1999 -(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	2000 -(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	2001 -(DWDialog *)dialog;
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2002 @end
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2003
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2004 @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	2005 -(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	2006 {
1050 48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2007 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	2008 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	2009 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	2010 [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	2011 return NO;
1050 48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2012 }
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2013 -(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	2014 -(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	2015 -(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	2016 @end
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	2017
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	2018 /* Subclass for a splitbar type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2019 @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	2020 #ifdef BUILDING_FOR_SNOW_LEOPARD
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2021 <NSSplitViewDelegate>
717 17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	2022 #endif
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2023 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2024 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	2025 float percent;
1956 2924bc788170 Mac: Added code to avoid unused variable/parameter warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1955 diff changeset	2026 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	2027 }
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	2028 -(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	2029 -(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	2030 -(void *)userdata;
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	2031 -(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	2032 -(float)percent;
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	2033 -(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	2034 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	2035
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	2036 @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	2037 -(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	2038 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2039 NSArray *views = [self subviews];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2040 id object;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2041
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2042 for(object in views)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2043 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2044 if([object isMemberOfClass:[DWBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2045 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2046 DWBox *view = object;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2047 Box *box = [view box];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2048 NSSize size = [view frame].size;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2049 _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	2050 _handle_resize_events(box);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2051 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2052 }
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	2053 }
1957 c15af2f757e2 Mac: Initial code to support Dark Mode on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1956 diff changeset	2054 -(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	2055 -(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	2056 -(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	2057 -(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	2058 -(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	2059 -(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	2060 @end
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	2061
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2062 /* 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	2063 @interface DWSlider : NSSlider
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2064 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2065 void *userdata;
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2066 }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2067 -(void *)userdata;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2068 -(void)setUserdata:(void *)input;
704 336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	2069 -(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	2070 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2071
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2072 @implementation DWSlider
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2073 -(void *)userdata { return 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 { 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	2075 -(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	2076 -(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	2077 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2078
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2079 /* 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	2080 @interface DWScrollbar : NSScroller
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2081 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2082 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	2083 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	2084 double visible;
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	2085 int vertical;
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2086 }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2087 -(void *)userdata;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2088 -(void)setUserdata:(void *)input;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2089 -(float)range;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2090 -(float)visible;
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	2091 -(int)vertical;
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	2092 -(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	2093 -(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	2094 -(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	2095 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2096
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2097 @implementation DWScrollbar
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2098 -(void *)userdata { return userdata; }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2099 -(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	2100 -(float)range { return range; }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2101 -(float)visible { return visible; }
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	2102 -(int)vertical { return vertical; }
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	2103 -(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	2104 -(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	2105 -(void)scrollerChanged:(id)sender
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2106 {
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	2107 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	2108 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	2109 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	2110
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2111 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	2112 {
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	2113 #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	2114 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	2115 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	2116 {
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2117 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	2118 }
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2119 break;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2120
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	2121 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	2122 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	2123 {
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 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	2125 }
86d76fc09237 Added support for scrollbar line and page scrolling. Need to check the calculations... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 706 diff changeset	2126 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	2127 #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	2128 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	2129 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	2130 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	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 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	2133 }
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 break;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2135
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 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	2137 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	2138 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	2139 {
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	2140 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	2141 }
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 break;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2143
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	2144 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	2145 ; /* 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	2146 }
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	2147 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	2148 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	2149 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	2150 {
923 0ac67b62b594 Fix int to double conversion issues causing scrollbar issues on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 922 diff changeset	2151 [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	2152 }
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	2153 _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	2154 }
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	2155 -(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	2156 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2157
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2158 /* Subclass for a MLE type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2159 @interface DWMLE : NSTextView
653 36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2160 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2161 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	2162 id scrollview;
653 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 -(void *)userdata;
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2165 -(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	2166 -(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	2167 -(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	2168 @end
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 @implementation DWMLE
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2171 -(void *)userdata { return userdata; }
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2172 -(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	2173 -(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	2174 -(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	2175 -(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	2176 @end
36c6669422d2 Continuing to add types... looking to almost be usable. :) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 652 diff changeset	2177
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2178 /* 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	2179 @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	2180 {
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2181 @private
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2182 NSImage *image;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2183 }
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2184 -(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	2185 -(NSImage *)image;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2186 -(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	2187 -(NSSize)cellSize;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2188 @end
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 @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	2191 -(void)dealloc
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2192 {
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2193 [image release];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2194 image = nil;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2195 [super dealloc];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2196 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2197 -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	2198 {
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2199 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	2200 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	2201 return cell;
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 -(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	2204 {
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2205 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	2206 {
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2207 [image release];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2208 image = [anImage retain];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2209 }
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2210 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2211 -(NSImage *)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 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	2214 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2215 -(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	2216 {
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2217 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	2218 {
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2219 NSRect imageFrame;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2220 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	2221 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	2222 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	2223 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	2224 return imageFrame;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2225 }
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2226 else
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2227 return NSZeroRect;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2228 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2229 -(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	2230 {
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2231 NSRect textFrame, imageFrame;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2232 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	2233 [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	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)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	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 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	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)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	2242 {
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2243 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	2244 {
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2245 NSSize imageSize;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2246 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	2247 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	2248 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	2249
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2250 imageSize = [image size];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2251 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	2252 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	2253 {
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2254 [[self backgroundColor] set];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2255 NSRectFill(imageFrame);
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2256 }
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2257 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	2258 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	2259
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	2260 /* 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	2261 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	2262 {
1993 e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	2263 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	2264
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	2265 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	2266
1914 3872ab37297b Fix numerous deprecation warnings building with SDK 10.12 Sierra. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1908 diff changeset	2267 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	2268 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2269 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	2270 {
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 /* 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	2272 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	2273
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2274 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	2275 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	2276 else
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2277 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	2278
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	2279 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	2280 {
1993 e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	2281 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	2282
1914 3872ab37297b Fix numerous deprecation warnings building with SDK 10.12 Sierra. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1908 diff changeset	2283 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	2284 }
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 }
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2286 }
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2287 [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	2288 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2289 -(NSSize)cellSize
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2290 {
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2291 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	2292 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	2293 return cellSize;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2294 }
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2295 @end
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2296
655 27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	2297 /* Subclass for a Container/List type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2298 @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	2299 #ifdef BUILDING_FOR_SNOW_LEOPARD
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	2300 <NSTableViewDataSource,NSTableViewDelegate>
717 17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	2301 #endif
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	2302 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2303 void *userdata;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2304 NSMutableArray *tvcols;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2305 NSMutableArray *data;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2306 NSMutableArray *types;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2307 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	2308 NSPointerArray *rowdatas;
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2309 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	2310 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	2311 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	2312 int lastAddPoint, lastQueryPoint;
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	2313 id scrollview;
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	2314 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	2315 }
0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	2316 -(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	2317 -(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	2318 -(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	2319 -(void *)userdata;
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	2320 -(void)setUserdata:(void *)input;
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	2321 -(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	2322 -(int)filesystem;
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	2323 -(id)scrollview;
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	2324 -(void)setScrollview:(id)input;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	2325 -(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	2326 -(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	2327 -(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	2328 -(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	2329 -(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	2330 -(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	2331 -(void)removeRow:(int)row;
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	2332 -(void)setRow:(int)row title:(void *)input;
756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	2333 -(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	2334 -(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	2335 -(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	2336 -(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	2337 -(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	2338 -(void)setLastQueryPoint:(int)input;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	2339 -(void)clear;
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	2340 -(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	2341 -(void)optimize;
1573 d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2342 -(NSSize)getsize;
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	2343 -(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	2344 -(void)doubleClicked:(id)sender;
829 f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	2345 -(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	2346 -(void)tableView:(NSTableView )tableView didClickTableColumn:(NSTableColumn )tableColumn;
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	2347 -(void)selectionChanged:(id)sender;
756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	2348 -(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	2349 #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	2350 -(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	2351 #endif
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	2352 @end
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	2353
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	2354 @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	2355 -(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	2356 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2357 if(tvcols && data)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2358 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2359 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	2360 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	2361 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	2362 {
41a93f9896e3 Avoid an array out of bounds after container clear on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1133 diff changeset	2363 return total / cols;
752 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 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2366 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	2367 }
0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	2368 -(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	2369 {
1134 41a93f9896e3 Avoid an array out of bounds after container clear on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1133 diff changeset	2370 if(tvcols && data)
752 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 int z, col = -1;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2373 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	2374
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2375 for(z=0;z<count;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2376 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2377 if([tvcols objectAtIndex:z] == aCol)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2378 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2379 col = z;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2380 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2381 }
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(col != -1)
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 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	2386 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	2387 {
41a93f9896e3 Avoid an array out of bounds after container clear on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1133 diff changeset	2388 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	2389 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	2390 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2391 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2392 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2393 return nil;
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	2394 }
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	2395 #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	2396 -(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	2397 {
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	2398 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	2399 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	2400 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	2401 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	2402 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	2403 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	2404 }
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 #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	2406 -(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	2407 -(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	2408 -(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	2409 -(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	2410 -(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	2411 -(id)scrollview { return scrollview; }
17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	2412 -(void)setScrollview:(id)input { scrollview = input; }
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	2413 -(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	2414 -(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	2415 -(void)refreshColors
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2416 {
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2417 NSColor *oldodd = oddcolor;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2418 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	2419 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	2420 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	2421 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	2422 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	2423
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2424 /* 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	2425 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	2426 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	2427 else
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2428 oddcolor = NULL;
1958 45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2429 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	2430 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	2431 else
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2432 evencolor = NULL;
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2433 [oldodd release];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2434 [oldeven release];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2435 }
1958 45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2436 -(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	2437 {
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2438 /* 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	2439 dw_oddcolor = oddcol;
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2440 dw_evencolor = evencol;
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2441 [self refreshColors];
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2442 }
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2443 -(void)checkDark
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2444 {
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2445 /* 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	2446 _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	2447 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	2448 _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	2449 else
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2450 _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	2451 /* 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	2452 if(titles)
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2453 [self refreshColors];
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2454 }
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	2455 -(void)viewDidChangeEffectiveAppearance { [self checkDark]; }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2456 -(int)insertRow:(NSArray *)input at:(int)index
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2457 {
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2458 if(data)
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2459 {
687 5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	2460 unsigned long start = [tvcols count] * index;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2461 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	2462 if(index < lastAddPoint)
5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	2463 {
5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	2464 lastAddPoint++;
5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	2465 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2466 [data insertObjects:input atIndexes:set];
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2467 [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	2468 [rowdatas insertPointer:NULL atIndex:index];
687 5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	2469 [set release];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2470 return (int)[titles count];
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2471 }
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2472 return 0;
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2473 }
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2474 -(int)addRow:(NSArray *)input
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2475 {
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2476 if(data)
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 lastAddPoint = (int)[titles count];
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2479 [data addObjectsFromArray:input];
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2480 [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	2481 [rowdatas addPointer:NULL];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2482 return (int)[titles count];
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 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	2485 }
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	2486 -(int)addRows:(int)number
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	2487 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2488 if(tvcols)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2489 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2490 int count = (int)(number * [tvcols count]);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2491 int z;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2492
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2493 lastAddPoint = (int)[titles count];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2494
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2495 for(z=0;z<count;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2496 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2497 [data addObject:[NSNull null]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2498 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2499 for(z=0;z<number;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2500 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2501 [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	2502 [rowdatas addPointer:NULL];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2503 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2504 return (int)[titles count];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2505 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2506 return 0;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2507 }
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	2508 -(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	2509 {
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2510 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	2511
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2512 /* 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	2513 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	2514 {
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 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	2516 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	2517 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	2518 [bcell setImage:img];
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2519 }
1215 dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2520 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	2521 {
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2522 /* 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	2523 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	2524 {
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2525 if(evencolor)
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2526 {
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2527 [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	2528 [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	2529 }
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2530 else
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2531 [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	2532 }
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2533 else
1215 dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2534 {
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2535 if(oddcolor)
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2536 {
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:YES];
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2538 [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	2539 }
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2540 else
dc8ea09605f7 Can't set the background on Image cells apparently on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1212 diff changeset	2541 [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	2542 }
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	2543 }
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	2544 }
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	2545 -(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	2546 {
1288 d10969835d2d Changes to allow removing icon on BITMAPORICON container columns on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1279 diff changeset	2547 if(tvcols)
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2548 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2549 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	2550 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	2551 {
1288 d10969835d2d Changes to allow removing icon on BITMAPORICON container columns on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1279 diff changeset	2552 if(!input)
d10969835d2d Changes to allow removing icon on BITMAPORICON container columns on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1279 diff changeset	2553 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	2554 [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	2555 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2556 }
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	2557 }
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	2558 -(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	2559 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2560 if(tvcols)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2561 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2562 int z, start, end;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2563 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	2564 void *oldtitle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2565
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	2566 start = (count * row);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2567 end = start + count;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	2568
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2569 for(z=start;z<end;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2570 {
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	2571 [data removeObjectAtIndex:start];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2572 }
1874 71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2573 oldtitle = [titles pointerAtIndex:row];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2574 [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	2575 [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	2576 if(lastAddPoint > 0 && lastAddPoint > row)
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2577 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2578 lastAddPoint--;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2579 }
1874 71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2580 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	2581 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	2582 }
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2583 }
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2584 -(void)setRow:(int)row title:(void *)input
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2585 {
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(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	2587 {
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2588 void *oldtitle = [titles pointerAtIndex:row];
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2589 void newtitle = input ? (void )strdup((char *)input) : NULL;
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2590 [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	2591 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	2592 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	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 }
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	2595 -(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	2596 -(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	2597 -(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	2598 -(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	2599 -(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	2600 -(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	2601 -(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	2602 -(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	2603 -(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	2604 {
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2605 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	2606 {
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2607 [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	2608 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	2609 {
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2610 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	2611 [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	2612 [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	2613 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	2614 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	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 }
71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2617 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	2618 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2619 -(void)setup
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2620 {
1774 4cc999e757a3 Check for pointerArrayWithWeakObjects before weakObjectsPointerArray on Mac bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1773 diff changeset	2621 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	2622
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	2623 if(![[NSPointerArray class] respondsToSelector:swopa])
1774 4cc999e757a3 Check for pointerArrayWithWeakObjects before weakObjectsPointerArray on Mac bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1773 diff changeset	2624 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	2625 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	2626 return;
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2627
1993 e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	2628 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	2629
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	2630 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	2631 [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	2632 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	2633 [rowdatas retain];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2634 tvcols = [[[NSMutableArray alloc] init] retain];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2635 data = [[[NSMutableArray alloc] init] retain];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2636 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	2637 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	2638 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	2639 [self checkDark];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2640 [[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	2641 }
1573 d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2642 -(NSSize)getsize
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2643 {
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2644 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	2645
1573 d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2646 if(tvcols)
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2647 {
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2648 int z;
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2649 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	2650 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	2651
1573 d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2652 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	2653 {
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2654 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	2655 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	2656
1573 d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2657 if(rowcount > 0)
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2658 {
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2659 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	2660
1573 d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2661 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	2662 {
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2663 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	2664 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	2665
1573 d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2666 /* 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	2667 if(z == 0)
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2668 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	2669
1573 d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2670 /* 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	2671 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	2672 {
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2673 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	2674 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	2675 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	2676 {
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2677 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	2678 }
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2679 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	2680
1573 d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2681 if(thiswidth > width)
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 width = thiswidth;
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 }
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2686 /* 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	2687 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	2688 {
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2689 width = 16;
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(width)
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2693 cwidth += width;
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 }
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2696 cwidth += 16;
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2697 cheight += 16;
d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2698 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	2699 }
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	2700 -(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	2701 {
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	2702 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	2703 {
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	2704 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	2705 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	2706 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	2707
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	2708 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	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 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	2711 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	2712 {
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	2713 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	2714 {
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 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	2716 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	2717 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	2718
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	2719 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	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 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	2722 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	2723
866 ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	2724 /* 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	2725 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	2726 {
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	2727 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	2728 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	2729 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	2730 {
ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	2731 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	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 }
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	2734
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	2735 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	2736 {
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	2737 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	2738 }
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	2739 }
866 ba9d38b8d0bc Added code to check the image size inside the cell during optimize. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 864 diff changeset	2740 /* 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	2741 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	2742 {
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	2743 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	2744 }
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	2745 /* 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	2746 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	2747 {
1963 80f6be39b7fe Mac: Miscellaneous container/listox fixes. Add a single pixel to the column bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1959 diff changeset	2748 [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	2749 }
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	2750 }
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	2751 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	2752 {
1963 80f6be39b7fe Mac: Miscellaneous container/listox fixes. Add a single pixel to the column bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1959 diff changeset	2753 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	2754 [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	2755 }
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 }
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 }
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	2759 }
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	2760 -(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	2761 {
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	2762 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	2763
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	2764 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	2765 [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	2766
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	2767 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	2768 {
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	2769 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	2770 NSTextFieldCell *cell = [tableColumn dataCell];
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	2771 [cell setTextColor:fgcolor];
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	2772 }
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	2773 }
708 5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	2774 -(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	2775 {
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	2776 void *params[2];
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	2777
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	2778 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	2779 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	2780
708 5fe2ca5ef88b Fixes for container event handling. Also made container/listbox cells non-editable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 707 diff changeset	2781 /* 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	2782 _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	2783 }
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	2784 -(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	2785 {
829 f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	2786 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	2787 {
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 void *params[2];
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	2789
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	2790 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	2791 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	2792
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	2793 _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	2794 }
829 f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	2795 [super keyUp:theEvent];
f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	2796 }
f7b6c88bac47 Implemented Enter/Return triggering the item enter event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 828 diff changeset	2797
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	2798 -(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	2799 {
7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	2800 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	2801
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	2802 /* Handler for column click class */
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	2803 _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	2804 }
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	2805 -(void)selectionChanged:(id)sender
756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	2806 {
1874 71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2807 void *params[2];
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	2808
1874 71c8a45b2a35 Fixes for Mac code and allocate and free duplicates of title strings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1871 diff changeset	2809 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	2810 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	2811
703 329736825f9b Implemented more of the missing event/signal handlers and other code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 702 diff changeset	2812 /* 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	2813 _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	2814 /* 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	2815 _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	2816 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2817 -(NSMenu )menuForEvent:(NSEvent )event
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	2818 {
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	2819 int row;
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	2820 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	2821 row = (int)[self rowAtPoint:where];
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	2822 _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	2823 return nil;
659 756015085da7 Fixes for container signal handling. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 658 diff changeset	2824 }
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	2825 -(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	2826 {
1809 5efaea897310 Fixed back tab handling for certain controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1808 diff changeset	2827 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	2828
1809 5efaea897310 Fixed back tab handling for certain controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1808 diff changeset	2829 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	2830 [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	2831 [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	2832 }
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	2833 -(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	2834 -(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	2835 -(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	2836 @end
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2837
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	2838 /* 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	2839 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	2840 {
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	2841 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	2842 {
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	2843 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	2844 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	2845 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	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(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	2848 index = [node indexOfObject:item];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2849
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	2850 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	2851 {
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	2852 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	2853 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	2854
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	2855 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	2856 {
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	2857 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	2858 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2859
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	2860 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	2861 {
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	2862 _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	2863 [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	2864 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	2865 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	2866 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	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 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	2869 {
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	2870 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	2871 [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	2872 _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	2873 }
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
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 _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	2876 }
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	2877 }
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	2878 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	2879 {
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	2880 [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	2881 }
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
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2884 /* Subclass for a Tree type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2885 @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	2886 #ifdef BUILDING_FOR_SNOW_LEOPARD
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	2887 <NSOutlineViewDataSource,NSOutlineViewDelegate>
717 17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	2888 #endif
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2889 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2890 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	2891 NSTableColumn *treecol;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2892 NSMutableArray *data;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2893 /* 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	2894 * 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	2895 */
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2896 id scrollview;
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	2897 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	2898 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2899 -(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	2900 -(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	2901 -(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	2902 -(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	2903 -(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	2904 -(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	2905 -(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	2906 -(void *)userdata;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2907 -(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	2908 -(void)treeSelectionChanged:(id)sender;
722 5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	2909 -(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	2910 -(NSScrollView *)scrollview;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2911 -(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	2912 -(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	2913 -(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	2914 -(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	2915 @end
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2916
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2917 @implementation DWTree
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2918 -(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	2919 {
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2920 self = [super init];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2921
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2922 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	2923 {
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	2924 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	2925 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	2926 [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	2927 [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	2928 [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	2929 [[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	2930 [[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	2931 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2932 return self;
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2933 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2934 -(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	2935 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2936 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	2937 {
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	2938 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	2939 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	2940 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2941 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2942 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2943 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	2944 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2945 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2946 -(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	2947 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2948 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	2949 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2950 -(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	2951 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2952 if(item)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2953 {
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	2954 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	2955 {
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	2956 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	2957 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	2958 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2959 else
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2960 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2961 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	2962 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2963 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2964 else
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2965 {
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2966 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	2967 }
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 -(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	2970 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2971 if(item)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2972 {
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	2973 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	2974 {
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	2975 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	2976 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	2977 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2978 else
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	2979 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2980 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	2981 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	2982 }
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2983 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	2984 }
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	2985 -(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	2986 {
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	2987 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	2988 {
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	2989 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	2990 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	2991 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	2992 [(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	2993 }
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 }
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	2995 -(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	2996 -(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	2997 {
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	2998 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	2999 if(parent)
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3000 {
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	3001 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	3002 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	3003 {
692 bd909322f40d Added "retain"s to the DWTree/DWContainer/DWListBox classes memory allocation bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 691 diff changeset	3004 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	3005 [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	3006 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3007 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3008 else
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3009 {
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3010 if(!data)
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3011 {
692 bd909322f40d Added "retain"s to the DWTree/DWContainer/DWListBox classes memory allocation bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 691 diff changeset	3012 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	3013 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3014 }
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	3015 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	3016 {
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	3017 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	3018 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	3019 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	3020 [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	3021 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	3022 [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	3023 }
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	3024 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	3025 {
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	3026 [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	3027 }
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3028 }
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3029 -(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	3030 -(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	3031 -(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	3032 {
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	3033 /* 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	3034 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	3035
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	3036 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	3037 {
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	3038 _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	3039 }
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	3040 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3041 -(void)treeItemExpanded:(NSNotification *)notification
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3042 {
722 5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	3043 id item = [[notification userInfo ] objectForKey: @"NSObject"];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3044
722 5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	3045 if(item)
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	3046 {
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	3047 _event_handler(self, (void *)item, 16);
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	3048 }
5a8d5161651d Implemented tree expand event. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 721 diff changeset	3049 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3050 -(NSMenu )menuForEvent:(NSEvent )event
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	3051 {
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	3052 int row;
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	3053 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	3054 row = (int)[self rowAtPoint:where];
78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	3055 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	3056 _event_handler(self, (NSEvent *)item, 10);
710 78460ff977c1 Finishing up tree event/signal handlers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 709 diff changeset	3057 return nil;
709 5a268d5f1cfa Fixes for tree event handling. Still more to come shortly... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 708 diff changeset	3058 }
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3059 -(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	3060 -(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	3061 -(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	3062 -(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	3063 {
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	3064 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	3065 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	3066 [fgcolor retain];
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	3067 [cell setTextColor:fgcolor];
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	3068 }
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	3069 -(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	3070 -(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	3071 {
1809 5efaea897310 Fixed back tab handling for certain controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1808 diff changeset	3072 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	3073
1809 5efaea897310 Fixed back tab handling for certain controls on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1808 diff changeset	3074 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	3075 [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	3076 [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	3077 }
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3078 -(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	3079 -(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	3080 -(void)dealloc
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3081 {
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3082 UserData *root = userdata;
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3083 _remove_userdata(&root, NULL, TRUE);
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3084 _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	3085 [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	3086 dw_signal_disconnect_by_window(self);
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3087 [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	3088 }
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3089 @end
db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	3090
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3091 /* Subclass for a Calendar type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3092 @interface DWCalendar : NSDatePicker
655 27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	3093 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3094 void *userdata;
655 27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	3095 }
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	3096 -(void *)userdata;
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	3097 -(void)setUserdata:(void *)input;
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	3098 @end
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	3099
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	3100 @implementation DWCalendar
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	3101 -(void *)userdata { return userdata; }
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	3102 -(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	3103 -(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	3104 @end
27eb39d2577b Calendar and HTML functions filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 654 diff changeset	3105
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3106 /* Subclass for a Combobox type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3107 @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	3108 #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	3109 <NSComboBoxDelegate>
17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	3110 #endif
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3111 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3112 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	3113 id clickDefault;
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3114 }
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3115 -(void *)userdata;
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3116 -(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	3117 -(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	3118 -(void)setClickDefault:(id)input;
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3119 @end
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 @implementation DWComboBox
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3122 -(void *)userdata { return userdata; }
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3123 -(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	3124 -(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	3125 -(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	3126 -(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	3127 {
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	3128 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	3129 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3130 [[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	3131 } else
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3132 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3133 [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	3134 }
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	3135 }
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	3136 -(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	3137 @end
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3138
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	3139 /* 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	3140 /* 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	3141 @interface DWStepper : NSStepper
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3142 {
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	3143 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	3144 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	3145 }
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 -(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	3147 -(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	3148 -(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	3149 -(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	3150 -(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	3151 -(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	3152 @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	3153
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	3154 @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	3155 -(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	3156 -(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	3157 -(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	3158 -(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	3159 -(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	3160 {
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 [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	3162 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	3163 [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	3164 }
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)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	3166 {
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3167 [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	3168 _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	3169 }
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	3170 -(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	3171 {
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3172 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	3173 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	3174 {
eecf0eb609d8 Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1805 diff changeset	3175 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	3176 [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	3177 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	3178 [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	3179 [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	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 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	3182 {
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 [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	3184 [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	3185 }
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 -(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	3188 -(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	3189 @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	3190
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3191 /* Subclass for a Spinbutton type */
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3192 @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	3193 #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	3194 <NSTextFieldDelegate>
17923b931393 Fixes for building for MacOS 10.5 and PPC bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 715 diff changeset	3195 #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	3196 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3197 void *userdata;
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3198 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	3199 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	3200 id clickDefault;
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3201 }
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3202 -(id)init;
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3203 -(void *)userdata;
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3204 -(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	3205 -(NSTextField *)textfield;
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3206 -(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	3207 -(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	3208 -(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	3209 @end
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3210
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3211 @implementation DWSpinButton
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3212 -(id)init
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3213 {
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3214 self = [super init];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3215
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3216 if(self)
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3217 {
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	3218 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	3219 [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	3220 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	3221 [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	3222 [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	3223 [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	3224 [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	3225 [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	3226 }
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3227 return self;
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3228 }
0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	3229 -(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	3230 -(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	3231 -(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	3232 -(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	3233 -(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	3234 {
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	3235 [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	3236 [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	3237 _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	3238 }
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	3239 -(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	3240 -(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	3241 {
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	3242 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	3243 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3244 [[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	3245 }
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3246 else
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3247 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3248 [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	3249 }
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	3250 }
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	3251 -(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	3252 -(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	3253 @end
6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	3254
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3255 /* 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	3256 * 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	3257 * 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	3258 */
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	3259 @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	3260 @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	3261
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 @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	3263 @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	3264
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3265 /* 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	3266 */
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	3267 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	3268 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3269 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	3270
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3271 new->message = message;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3272 new->window = window;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3273 new->id = msgid;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3274 new->signalfunction = signalfunction;
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	3275 new->discfunction = discfunc;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3276 new->data = data;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3277 new->next = NULL;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3278
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3279 if (!Root)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3280 Root = new;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3281 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3282 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3283 SignalHandler prev = NULL, tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3284 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3285 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3286 if(tmp->message == message &&
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3287 tmp->window == window &&
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3288 tmp->id == msgid &&
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3289 tmp->signalfunction == signalfunction)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3290 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3291 tmp->data = data;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3292 free(new);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3293 return;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3294 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3295 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3296 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3297 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3298 if(prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3299 prev->next = new;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3300 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3301 Root = new;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3302 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3303 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3304
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3305 /* Finds the message number for a given signal name */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3306 ULONG _findsigmessage(char *signame)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3307 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3308 int z;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3309
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3310 for(z=0;z<SIGNALMAX;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3311 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3312 if(strcasecmp(signame, SignalTranslate[z].name) == 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3313 return SignalTranslate[z].message;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3314 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3315 return 0L;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3316 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3317
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3318 unsigned long _foreground = 0xAAAAAA, _background = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3319
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	3320 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	3321 {
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	3322 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	3323
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	3324 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	3325 {
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 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	3327
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	3328 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	3329 {
1906 fac81560eb09 Fix a number of warning generated by the new bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1905 diff changeset	3330 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	3331
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	3332 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	3333 {
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 _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	3335 }
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	3336 }
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	3337 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	3338 {
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 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	3340 {
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 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	3342 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	3343 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	3344
b498fb0360fc Mac: 10.14 seems to have drastically changed the drawing mechanism. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1940 diff changeset	3345 /* 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	3346 * 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	3347 */
b498fb0360fc Mac: 10.14 seems to have drastically changed the drawing mechanism. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1940 diff changeset	3348 #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	3349 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	3350
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	3351 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	3352 {
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	3353 [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	3354 }
1941 b498fb0360fc Mac: 10.14 seems to have drastically changed the drawing mechanism. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1940 diff changeset	3355 #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	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 /* 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	3358 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	3359 {
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 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	3361 {
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	3362 [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	3363 _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	3364 }
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 }
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 /* 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	3368 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	3369 {
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 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	3371 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	3372 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	3373
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	3374 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	3375 {
1906 fac81560eb09 Fix a number of warning generated by the new bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1905 diff changeset	3376 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	3377 _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	3378 }
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	3379 }
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	3380 /* 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	3381 * 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	3382 */
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 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	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 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	3386 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	3387 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	3388
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	3389 /* 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	3390 _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	3391 }
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 }
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 }
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	3394 }
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
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3396 /* 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	3397 * and does expansion as necessary.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3398 */
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	3399 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	3400 {
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	3401 /* 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	3402 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	3403 /* 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	3404 * 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	3405 * 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	3406 */
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	3407 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	3408 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	3409
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	3410 /* 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	3411 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	3412
798 1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	3413 /* Handle special groupbox case */
1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 diff changeset	3414 if(thisbox->grouphwnd)
1b0a0775ec19 Ok... groupbox calculation fix try #2! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 797 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 /* 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	3417 * 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	3418 */
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	3419 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	3420 {
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	3421 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	3422 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	3423 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	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(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	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 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	3428 }
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 /* 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	3430 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	3431
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 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	3433 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	3434 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	3435
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	3436 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	3437 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	3438 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	3439 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	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 /* 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	3443 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	3444 {
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	3445 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	3446
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	3447 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	3448 {
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	3449 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	3450 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	3451
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3452 if(tmp)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3453 {
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	3454 /* 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	3455 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	3456 {
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	3457 (*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	3458
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	3459 /* 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	3460 _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	3461
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	3462 /* 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	3463 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	3464 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	3465
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	3466 /* 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	3467 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	3468 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	3469 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	3470 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	3471
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	3472 (*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	3473 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3474 }
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	3475 }
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	3476
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	3477 /* 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	3478 * 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	3479 */
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	3480 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	3481 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	3482 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	3483
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	3484 /* 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	3485 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	3486 {
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 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	3488 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	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 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	3491 {
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	3492 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	3493 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	3494 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3495 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	3496 {
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	3497 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	3498 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	3499 }
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	3500 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	3501 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	3502 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	3503 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	3504 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	3505 }
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	3506 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	3507 {
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	3508 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	3509 uymax = itemheight;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3510 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	3511 {
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	3512 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	3513 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	3514 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3515 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	3516 {
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	3517 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	3518 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	3519 }
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	3520 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	3521 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	3522 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	3523 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	3524 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	3525 }
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 }
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
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 /* 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	3529 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	3530 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	3531 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	3532 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	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 /* 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	3535 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	3536 {
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	3537 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	3538 {
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	3539 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	3540 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	3541 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	3542 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	3543
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	3544 /* 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	3545 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	3546 {
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 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	3548 {
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 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	3550
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	3551 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	3552 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	3553 }
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 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	3555 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	3556 }
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(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	3558 {
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	3559 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	3560 {
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	3561 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	3562
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	3563 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	3564 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	3565 }
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	3566 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	3567 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	3568 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	3569
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	3570 /* 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	3571 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	3572 {
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 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	3574 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	3575 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	3576 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	3577
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	3578 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	3579 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	3580 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	3581 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	3582 [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	3583 [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	3584
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	3585 /* 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	3586 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	3587 {
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 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	3589 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	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 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	3592 {
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	3593 (*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	3594 _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	3595 (*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	3596 }
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	3597 }
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	3598
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	3599 /* 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	3600 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	3601 {
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	3602 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	3603 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	3604 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	3605
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	3606 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	3607 {
1906 fac81560eb09 Fix a number of warning generated by the new bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1905 diff changeset	3608 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	3609 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	3610 _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	3611 _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	3612 }
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	3613 }
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	3614 /* 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	3615 * 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	3616 */
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 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	3618 {
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	3619 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	3620 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	3621 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	3622 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	3623 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	3624
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	3625 /* 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	3626 _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	3627
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	3628 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	3629 {
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	3630 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	3631 }
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 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	3633 {
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	3634 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	3635 }
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	3636 [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	3637
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	3638 /* 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	3639 _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	3640 _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	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 /* 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	3643 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	3644 {
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 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	3646 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	3647 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	3648 [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	3649 [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	3650 [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	3651 [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	3652 }
1101 d7eafaa054ab Added support for dw_window_redraw() causing splitbar panes to redraw without bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1100 diff changeset	3653 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	3654 {
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 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	3656 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	3657 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	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 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	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 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	3662 [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	3663 }
1101 d7eafaa054ab Added support for dw_window_redraw() causing splitbar panes to redraw without bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1100 diff changeset	3664 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	3665 {
1128 7d7535f6bc4e Added ability to set background color of MLE; setting foreground still outstanding. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1120 diff changeset	3666 [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	3667 }
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	3668 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	3669
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	3670 /* 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	3671 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	3672 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	3673 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	3674 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	3675 }
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	3676 }
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 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3678 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3679
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3680 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	3681 {
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	3682 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	3683 {
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	3684 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	3685 {
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	3686 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	3687
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	3688 /* 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	3689 _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	3690
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	3691 /* 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	3692 _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	3693 }
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 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3695 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3696
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	3697 NSMenu *_generate_main_menu()
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	3698 {
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	3699 NSString *applicationName = nil;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3700
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	3701 /* 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	3702 #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	3703 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	3704 #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	3705 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	3706 {
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 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	3708 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3709
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3710 /* Create the main menu */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3711 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	3712
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3713 NSMenuItem * mitem = [mainMenu addItemWithTitle:@"Apple" action:NULL keyEquivalent:@""];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3714 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	3715
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	3716 #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	3717 [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	3718 #endif
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3719
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3720 /* Setup the Application menu */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3721 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	3722 action:@selector(orderFrontStandardAboutPanel:)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3723 keyEquivalent:@""];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3724 [item setTarget:DWApp];
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 [menu addItem:[NSMenuItem separatorItem]];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3727
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3728 item = [menu addItemWithTitle:NSLocalizedString(@"Services", nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3729 action:NULL
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3730 keyEquivalent:@""];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3731 NSMenu * servicesMenu = [[[NSMenu alloc] initWithTitle:@"Services"] autorelease];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3732 [menu setSubmenu:servicesMenu forItem:item];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3733 [DWApp setServicesMenu:servicesMenu];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3734
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3735 [menu addItem:[NSMenuItem separatorItem]];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3736
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3737 item = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"Hide", nil), applicationName]
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3738 action:@selector(hide:)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3739 keyEquivalent:@"h"];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3740 [item setTarget:DWApp];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3741
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3742 item = [menu addItemWithTitle:NSLocalizedString(@"Hide Others", nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3743 action:@selector(hideOtherApplications:)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3744 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	3745 [item setKeyEquivalentModifierMask:DWEventModifierFlagCommand \| DWEventModifierFlagOption];
752 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(@"Show All", nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3749 action:@selector(unhideAllApplications:)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3750 keyEquivalent:@""];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3751 [item setTarget:DWApp];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3752
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3753 [menu addItem:[NSMenuItem separatorItem]];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3754
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3755 item = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"Quit", nil), applicationName]
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3756 action:@selector(terminate:)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3757 keyEquivalent:@"q"];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3758 [item setTarget:DWApp];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3759
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3760 [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	3761
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3762 return mainMenu;
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	3763 }
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	3764
80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	3765 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3766 * 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	3767 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3768 void API dw_main(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3769 {
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	3770 #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	3771 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	3772 #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	3773 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	3774 /* 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	3775 _dw_redraw(0, FALSE);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3776 [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	3777 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	3778 #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	3779 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	3780 #endif
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3781 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3782
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3783 /*
1528 5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1527 diff changeset	3784 * 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	3785 */
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1527 diff changeset	3786 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	3787 {
1529 92bed442620a Didn't notice that [NSApplication stop] took a sender parameter on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1528 diff changeset	3788 [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	3789 _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	3790 }
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 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3793 * 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	3794 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3795 * 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	3796 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3797 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	3798 {
694 130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	3799 DWTID curr = pthread_self();
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3800
694 130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	3801 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	3802 {
130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	3803 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	3804 NSDate *until = [NSDate dateWithTimeIntervalSinceNow:(milliseconds/1000.0)];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3805
695 3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	3806 if(orig == (DWTID)-1)
3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	3807 {
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	3808 #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	3809 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	3810 #endif
695 3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	3811 DWThread = curr;
3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	3812 }
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	3813 /* 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	3814 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	3815 {
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	3816 /* Just loop */
695 3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	3817 }
3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	3818 if(orig == (DWTID)-1)
3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	3819 {
3b17111499bf Minor updates to the last commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 694 diff changeset	3820 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	3821 #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	3822 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	3823 #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	3824 }
130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	3825 }
130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	3826 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	3827 {
694 130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	3828 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	3829 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3830 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3831
700 7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	3832 /* 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	3833 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	3834 {
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	3835 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	3836 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	3837 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	3838 dequeue:YES];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3839 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	3840 {
130ca42c4ae3 Reimplementation of dw_main_iteration and dw_main_sleep that actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 693 diff changeset	3841 [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	3842 [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	3843 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	3844 }
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	3845 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3846 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3847
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3848 /*
700 7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	3849 * 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	3850 */
7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	3851 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	3852 {
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	3853 DWTID curr = pthread_self();
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	3854
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	3855 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	3856 {
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	3857 #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	3858 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	3859 #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	3860 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	3861 _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	3862 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	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_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	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 }
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 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	3868 {
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	3869 _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	3870 }
700 7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	3871 }
7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	3872
7953f0471e4d Some cleanups for the run loop iteration and thread system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 699 diff changeset	3873 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3874 * 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	3875 */
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	3876 void API dw_shutdown(void)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3877 {
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	3878 #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	3879 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	3880 [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	3881 #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	3882 }
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	3883
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	3884 /*
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	3885 * 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	3886 * Parameters:
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	3887 * 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	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 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	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 dw_shutdown();
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3892 exit(exitcode);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3893 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3894
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3895 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3896 * 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	3897 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3898 * ptr: Pointer to dynamic windows allocated
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3899 * memory to be free()'d.
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 void API dw_free(void *ptr)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3902 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3903 free(ptr);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3904 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3905
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 * 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	3908 * 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	3909 * OS/2 and Windows).
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 char *dw_user_dir(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3912 {
1381 3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	3913 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	3914
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3915 if(!_user_dir[0])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3916 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3917 char *home = getenv("HOME");
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3918
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3919 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	3920 strncpy(_user_dir, home, PATH_MAX);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3921 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3922 strcpy(_user_dir, "/");
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3923 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3924 return _user_dir;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3925 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3926
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3927 /*
1381 3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	3928 * 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	3929 * 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	3930 */
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1383 diff changeset	3931 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	3932 {
3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	3933 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	3934 }
3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	3935
3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	3936 /*
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	3937 * 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	3938 * 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	3939 * 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	3940 * ...: 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	3941 */
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	3942 void API dw_debug(char *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	3943 {
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 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	3945 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	3946
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 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	3948 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	3949 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	3950
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	3951 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	3952 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	3953
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	3954 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3955 * 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	3956 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3957 * 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	3958 * 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	3959 * format: printf style format string.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3960 * ...: 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	3961 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3962 int API dw_messagebox(char title, int flags, char format, ...)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3963 {
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	3964 NSInteger iResponse;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3965 NSString *button1 = @"OK";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3966 NSString *button2 = nil;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3967 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	3968 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	3969 NSString *mtext;
8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	3970 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	3971 NSArray *params;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3972 va_list args;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3973
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3974 if(flags & DW_MB_OKCANCEL)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3975 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3976 button2 = @"Cancel";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3977 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3978 else if(flags & DW_MB_YESNO)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3979 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3980 button1 = @"Yes";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3981 button2 = @"No";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3982 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3983 else if(flags & DW_MB_YESNOCANCEL)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3984 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3985 button1 = @"Yes";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3986 button2 = @"No";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3987 button3 = @"Cancel";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	3988 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	3989
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	3990 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	3991 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	3992 va_end(args);
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	3993
1914 3872ab37297b Fix numerous deprecation warnings building with SDK 10.12 Sierra. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1908 diff changeset	3994 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	3995 mstyle = DWAlertStyleCritical;
1914 3872ab37297b Fix numerous deprecation warnings building with SDK 10.12 Sierra. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1908 diff changeset	3996 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	3997 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	3998
1985 8d130e45430d Mac: Rewrite dw_messagebox() to make it thread safe on Mojave. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1984 diff changeset	3999 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	4000 [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	4001 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	4002
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4003 switch(iResponse)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4004 {
1902 74f50459c530 Fix some deprecations introduced in Mac OS X Yosemite 10.10... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1896 diff changeset	4005 case NSAlertFirstButtonReturn: /* user pressed OK */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4006 if(flags & DW_MB_YESNO \|\| flags & DW_MB_YESNOCANCEL)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4007 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4008 return DW_MB_RETURN_YES;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4009 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4010 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	4011 case NSAlertSecondButtonReturn: /* user pressed Cancel */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4012 if(flags & DW_MB_OKCANCEL)
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_CANCEL;
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_NO;
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 NSAlertThirdButtonReturn: /* user pressed the third button */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4018 return DW_MB_RETURN_CANCEL;
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 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4021 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4022
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4023 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4024 * 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	4025 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4026 * title: Title bar text for dialog.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4027 * 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	4028 * ext: Default file extention.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4029 * 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	4030 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4031 * 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	4032 * the file path on success.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4033 *
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4034 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4035 char * API dw_file_browse(char title, char defpath, char *ext, int flags)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4036 {
1298 79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4037 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	4038 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	4039 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	4040
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	4041 /* 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	4042 * 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	4043 */
1704 873304f581be Fix Unicode issues with the directory browser on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1679 diff changeset	4044 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	4045 {
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4046 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	4047
1298 79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4048 /* 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	4049 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	4050 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	4051
1298 79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4052 /* 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	4053 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	4054 {
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4055 /* 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	4056 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	4057 path = temp;
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4058 else
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4059 file = temp;
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 /* 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	4062 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	4063 {
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4064 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	4065
1298 79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4066 /* 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	4067 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	4068 {
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4069 x--;
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4070 }
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4071 if(temp[x] == '/')
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4072 {
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4073 temp[x] = 0;
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4074 /* 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	4075 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	4076 {
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4077 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	4078 {
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4079 /* 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	4080 path = temp;
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4081 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	4082 }
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4083 }
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 }
79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4086 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4087
825 8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	4088 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	4089 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4090 /* Create the File Open Dialog class. */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4091 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	4092
1298 79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4093 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	4094 {
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	4095 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	4096
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	4097 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	4098 {
1993 e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	4099 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	4100 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	4101 }
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	4102 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4103
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4104 /* 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	4105 if(flags == DW_FILE_OPEN)
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	4106 {
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	4107 [openDlg setCanChooseFiles:YES];
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	4108 [openDlg setCanChooseDirectories:NO];
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	4109 }
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	4110 else
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	4111 {
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	4112 [openDlg setCanChooseFiles:NO];
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	4113 [openDlg setCanChooseDirectories:YES];
8a2e3138e1e4 Implemented DW_DIRECTORY_OPEN on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 821 diff changeset	4114 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4115
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	4116 /* Handle file types */
1704 873304f581be Fix Unicode issues with the directory browser on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1679 diff changeset	4117 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	4118 {
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	4119 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	4120 [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	4121 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4122
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4123 /* Disable multiple selection */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4124 [openDlg setAllowsMultipleSelection:NO];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4125
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4126 /* Display the dialog. If the OK button was pressed,
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4127 * process the files.
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4128 */
1903 b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	4129 if([openDlg runModal] == DWModalResponseOK)
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4130 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4131 /* Get an array containing the full filenames of all
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4132 * files and directories selected.
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4133 */
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	4134 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	4135 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	4136 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	4137 {
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	4138 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	4139 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	4140 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	4141 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4142 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4143 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4144 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4145 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4146 /* Create the File Save Dialog class. */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4147 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	4148
1298 79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4149 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	4150 {
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	4151 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	4152
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	4153 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	4154 {
1993 e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	4155 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	4156 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	4157 }
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	4158 }
1298 79db0563c7c2 Code to split the file and path apart on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1296 diff changeset	4159 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	4160 {
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	4161 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	4162
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	4163 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	4164 {
1993 e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	4165 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	4166 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	4167 }
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	4168 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4169
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4170 /* Enable the creation of directories in the dialog. */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4171 [saveDlg setCanCreateDirectories:YES];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4172
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	4173 /* Handle file types */
1704 873304f581be Fix Unicode issues with the directory browser on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1679 diff changeset	4174 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	4175 {
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	4176 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	4177 [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	4178 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4179
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4180 /* Display the dialog. If the OK button was pressed,
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4181 * process the files.
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4182 */
2032 5ca399fb2d6f Mac: Put back the delayed setNeedsDisplay workaround for Mojave only. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2031 diff changeset	4183 if([saveDlg runModal] == DWModalResponseOK)
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4184 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4185 /* Get an array containing the full filenames of all
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4186 * files and directories selected.
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4187 */
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	4188 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	4189 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	4190 {
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	4191 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	4192 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	4193 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	4194 }
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	4195 }
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 DW_LOCAL_POOL_OUT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4198 return NULL;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4199 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4200
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4201 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4202 * 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	4203 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4204 * None.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4205 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4206 * 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	4207 * be converted to text.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4208 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4209 char *dw_clipboard_get_text()
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4210 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4211 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	4212 NSString *str = [pasteboard stringForType:NSPasteboardTypeString];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4213 if(str != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4214 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4215 return strdup([ str UTF8String ]);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4216 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4217 return NULL;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4218 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4219
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4220 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4221 * 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	4222 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4223 * Text.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4224 */
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	4225 void dw_clipboard_set_text( char *str, int len)
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	4226 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4227 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	4228 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	4229
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	4230 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	4231 {
1993 e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	4232 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	4233 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	4234 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4235
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	4236 [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	4237 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4238
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4239
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4240 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4241 * Allocates and initializes a dialog struct.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4242 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4243 * 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	4244 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4245 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	4246 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4247 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	4248
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4249 if(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4250 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4251 tmp->eve = dw_event_new();
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4252 dw_event_reset(tmp->eve);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4253 tmp->data = data;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4254 tmp->done = FALSE;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4255 tmp->result = NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4256 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	4257 return tmp;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4258 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4259
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4260 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4261 * 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	4262 * initial called of dw_dialog_wait().
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4263 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4264 * 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	4265 * 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	4266 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4267 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	4268 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4269 dialog->result = result;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4270 dw_event_post(dialog->eve);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4271 dialog->done = TRUE;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4272 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4273 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4274
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4275 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4276 * 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	4277 * 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	4278 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4279 * 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	4280 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4281 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	4282 {
1886 f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	4283 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	4284
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	4285 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	4286 {
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	4287 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	4288 {
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	4289 _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	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 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	4292 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	4293 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	4294 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4295 return tmp;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4296 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4297
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4298 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4299 * 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	4300 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4301 * 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	4302 * 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	4303 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4304 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	4305 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	4306 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	4307 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	4308 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4309 DW_FUNCTION_INIT;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4310 DWBox *view = [[DWBox alloc] init];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4311 Box *newbox = [view box];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4312 memset(newbox, 0, sizeof(Box));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4313 newbox->pad = pad;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	4314 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	4315 DW_FUNCTION_RETURN_THIS(view);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4316 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4317
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4318 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4319 * 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	4320 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4321 * 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	4322 * 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	4323 * 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	4324 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4325 HWND API dw_groupbox_new(int type, int pad, char *title)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4326 {
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	4327 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	4328 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	4329 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	4330
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	4331 [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	4332 [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	4333 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	4334 [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	4335 [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	4336 return groupbox;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4337 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4338
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4339 /*
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4340 * Create a new scrollable Box to be packed.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4341 * Parameters:
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4342 * 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	4343 * 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	4344 */
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	4345 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	4346 {
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	4347 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	4348 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	4349 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	4350 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	4351 [scrollbox setHasVerticalScroller:YES];
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	4352 [scrollbox setHasHorizontalScroller:YES];
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	4353 [scrollbox setBorderType:NSNoBorder];
838 8e0405435d0a Minor scrollbox fixes... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 837 diff changeset	4354 [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	4355 [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	4356 [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	4357 [tmpbox autorelease];
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	4358 return scrollbox;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4359 }
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4360
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4361 /*
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4362 * 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	4363 * Parameters:
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4364 * handle: Handle to the scrollbox to be queried.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4365 * orient: The vertical or horizontal scrollbar.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4366 */
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	4367 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	4368 {
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	4369 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	4370 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	4371 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	4372 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	4373 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	4374 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	4375 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	4376 {
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 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	4378 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	4379 }
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 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	4381 {
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 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	4383 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	4384 }
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 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	4386 {
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 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	4388 }
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 return val;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4390 }
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4391
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4392 /*
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4393 * 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	4394 * Parameters:
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4395 * handle: Handle to the scrollbox to be queried.
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4396 * orient: The vertical or horizontal scrollbar.
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 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	4399 {
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	4400 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	4401 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	4402 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	4403 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	4404 {
5103d132c3cd Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 840 diff changeset	4405 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	4406 }
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 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	4408 {
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 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	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 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	4412 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	4413
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	4414 /* 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	4415 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	4416 {
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	4417 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	4418 {
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	4419 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	4420 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	4421 }
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 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	4423 {
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 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	4425 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	4426
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	4427 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	4428 {
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 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	4430 }
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 }
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	4432 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	4433 }
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
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4435 /* 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	4436 * 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	4437 *
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	4438 * 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	4439 * 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	4440 * 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	4441 * 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	4442 * 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	4443 * 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	4444 * 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	4445 */
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4446 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	4447 {
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4448 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	4449 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	4450 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	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 /* 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	4453 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	4454 {
1420 fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4455 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	4456 {
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	4457 case DWButtonTypeSwitch:
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	4458 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	4459 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	4460 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	4461 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	4462 break;
fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4463 default:
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4464 {
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 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	4466
1420 fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4467 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	4468 {
fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4469 /* 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	4470 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	4471 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	4472 thisheight = (int)size.height;
1432 6aa94c8a91de Bordered bitmap buttons need extra padding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	4473 if([object isBordered])
6aa94c8a91de Bordered bitmap buttons need extra padding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	4474 {
6aa94c8a91de Bordered bitmap buttons need extra padding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	4475 extrawidth = 4;
6aa94c8a91de Bordered bitmap buttons need extra padding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	4476 extraheight = 4;
6aa94c8a91de Bordered bitmap buttons need extra padding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	4477 }
1420 fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4478 }
fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4479 else
fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4480 {
fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4481 /* 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	4482 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	4483
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4484 if([object isBordered])
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4485 {
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4486 extrawidth = 30;
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4487 extraheight = 8;
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4488 }
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4489 else
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4490 {
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4491 extrawidth = 8;
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4492 extraheight = 4;
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4493 }
1420 fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4494 }
fabf23bdc7fb New Mac image button handling code was catching checkboxes/radiobuttons as well. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1419 diff changeset	4495 break;
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4496 }
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4497 }
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4498 }
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4499 /* 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	4500 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	4501 {
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4502 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	4503
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	4504 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	4505 {
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 /* 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	4507 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	4508 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	4509 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	4510 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	4511 /* 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	4512 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	4513 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	4514 /* 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	4515 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	4516 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	4517 }
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4518 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	4519 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	4520
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4521 if(font)
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4522 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	4523 }
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4524 /* 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	4525 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	4526 [ object isMemberOfClass:[DWSlider class] ])
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4527 {
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	4528 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	4529 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	4530 }
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 /* 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	4532 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	4533 {
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 if([object vertical])
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4535 {
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4536 thiswidth = 14;
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4537 thisheight = 100;
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4538 }
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4539 else
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4540 {
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4541 thiswidth = 100;
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4542 thisheight = 14;
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4543 }
8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4544 }
1421 63d253a2cdd9 Added bitmap autosizing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1420 diff changeset	4545 /* Handle bitmap size */
63d253a2cdd9 Added bitmap autosizing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1420 diff changeset	4546 else if([ object isMemberOfClass:[NSImageView class] ])
63d253a2cdd9 Added bitmap autosizing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1420 diff changeset	4547 {
63d253a2cdd9 Added bitmap autosizing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1420 diff changeset	4548 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	4549
1421 63d253a2cdd9 Added bitmap autosizing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1420 diff changeset	4550 if(image)
63d253a2cdd9 Added bitmap autosizing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1420 diff changeset	4551 {
63d253a2cdd9 Added bitmap autosizing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1420 diff changeset	4552 NSSize size = [image size];
63d253a2cdd9 Added bitmap autosizing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1420 diff changeset	4553 thiswidth = (int)size.width;
63d253a2cdd9 Added bitmap autosizing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1420 diff changeset	4554 thisheight = (int)size.height;
63d253a2cdd9 Added bitmap autosizing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1420 diff changeset	4555 }
63d253a2cdd9 Added bitmap autosizing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1420 diff changeset	4556 }
1533 7bc189ef0cd0 Add code to determine the size of the calendar control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1531 diff changeset	4557 /* 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	4558 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	4559 {
7bc189ef0cd0 Add code to determine the size of the calendar control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1531 diff changeset	4560 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	4561
1533 7bc189ef0cd0 Add code to determine the size of the calendar control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1531 diff changeset	4562 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	4563 {
7bc189ef0cd0 Add code to determine the size of the calendar control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1531 diff changeset	4564 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	4565
1533 7bc189ef0cd0 Add code to determine the size of the calendar control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1531 diff changeset	4566 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	4567 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	4568 }
7bc189ef0cd0 Add code to determine the size of the calendar control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1531 diff changeset	4569 }
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4570 /* MLE and Container */
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4571 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	4572 [ object isMemberOfClass:[DWContainer class] ])
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4573 {
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4574 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	4575
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4576 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	4577 {
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4578 NSScrollView *sv = [object scrollview];
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4579 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	4580 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	4581
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	4582 /* 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	4583 if(!hscroll)
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4584 {
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4585 [[object textContainer] setWidthTracksTextView:NO];
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4586 [[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	4587 [object setHorizontallyResizable:YES];
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4588 [sv setHasHorizontalScroller:YES];
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4589 }
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	4590 /* 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	4591 [object sizeToFit];
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4592 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	4593 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	4594 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	4595 /* 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	4596 if(!hscroll)
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4597 {
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4598 [[object textContainer] setWidthTracksTextView:YES];
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4599 [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	4600
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	4601 /* 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	4602 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	4603 {
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	4604 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	4605
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	4606 /* 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	4607 [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	4608 /* 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	4609 [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	4610 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	4611 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	4612 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	4613 [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	4614 }
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4615 }
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4616 [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	4617 /* 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	4618 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	4619 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	4620 }
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4621 else
1573 d6e17c8f4de2 Fixed container and listbox not accounting for contents on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	4622 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	4623
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4624 thiswidth = size.width;
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4625 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	4626
1549 ca6be9c48fff Implemented auto-sizing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1543 diff changeset	4627 if(thiswidth < _DW_SCROLLED_MIN_WIDTH)
ca6be9c48fff Implemented auto-sizing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1543 diff changeset	4628 thiswidth = _DW_SCROLLED_MIN_WIDTH;
ca6be9c48fff Implemented auto-sizing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1543 diff changeset	4629 if(thiswidth > _DW_SCROLLED_MAX_WIDTH)
ca6be9c48fff Implemented auto-sizing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1543 diff changeset	4630 thiswidth = _DW_SCROLLED_MAX_WIDTH;
ca6be9c48fff Implemented auto-sizing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1543 diff changeset	4631 if(thisheight < _DW_SCROLLED_MIN_HEIGHT)
ca6be9c48fff Implemented auto-sizing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1543 diff changeset	4632 thisheight = _DW_SCROLLED_MIN_HEIGHT;
ca6be9c48fff Implemented auto-sizing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1543 diff changeset	4633 if(thisheight > _DW_SCROLLED_MAX_HEIGHT)
ca6be9c48fff Implemented auto-sizing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1543 diff changeset	4634 thisheight = _DW_SCROLLED_MAX_HEIGHT;
ca6be9c48fff Implemented auto-sizing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1543 diff changeset	4635 }
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4636 /* Tree */
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	4637 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	4638 {
1566 035bc006afbe Experimental change... halfway between min and max for tree controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1564 diff changeset	4639 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	4640 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	4641 }
1533 7bc189ef0cd0 Add code to determine the size of the calendar control on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1531 diff changeset	4642 /* 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	4643 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	4644 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	4645
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4646 /* 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	4647 * 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	4648 */
d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	4649 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	4650 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	4651
1418 461240f946d0 Status text fields needs extra space on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1411 diff changeset	4652 /* 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	4653 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	4654 {
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	4655 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	4656
1778 e71ab68198ce Minor cleanups for the Mac status text changes for 10.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1776 diff changeset	4657 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	4658
1418 461240f946d0 Status text fields needs extra space on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1411 diff changeset	4659 /* 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	4660 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	4661 {
1778 e71ab68198ce Minor cleanups for the Mac status text changes for 10.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1776 diff changeset	4662 extrawidth += 2;
e71ab68198ce Minor cleanups for the Mac status text changes for 10.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1776 diff changeset	4663 extraheight = 8;
e71ab68198ce Minor cleanups for the Mac status text changes for 10.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1776 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 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4666
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	4667 /* 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	4668 if(width)
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4669 *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	4670 if(height)
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4671 *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	4672 }
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4673
1086 4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4674 /* 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	4675 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	4676 {
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4677 //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	4678 //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	4679 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	4680 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	4681 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	4682 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	4683 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	4684 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	4685
1086 4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4686 /*
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4687 * 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	4688 * 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	4689 */
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4690 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	4691 {
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4692 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	4693 return;
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4694 }
1128 7d7535f6bc4e Added ability to set background color of MLE; setting foreground still outstanding. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1120 diff changeset	4695
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	4696 /* 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	4697 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	4698 {
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	4699 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	4700 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	4701 }
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 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	4703 {
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 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	4705 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	4706 }
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 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	4709 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	4710 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	4711
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 /* 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	4713 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	4714 [ 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	4715 [ 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	4716 {
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	4717 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	4718 }
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	4719
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	4720 /* 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	4721 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	4722 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	4723 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	4724 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	4725 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	4726 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	4727
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	4728 /* 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	4729 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	4730
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 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	4732 {
1079 5d3acda4acd4 Fixed a minor cut and paste error and formatting on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1077 diff changeset	4733 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	4734 x++;
5d3acda4acd4 Fixed a minor cut and paste error and formatting on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1077 diff changeset	4735 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	4736 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	4737 }
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
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	4739 /* 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	4740 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	4741 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	4742 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	4743 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	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 /* 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	4746 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	4747 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	4748 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	4749 {
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4750 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	4751 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	4752 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	4753 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	4754
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 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	4756 }
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	4757
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	4758 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	4759 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	4760 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	4761 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	4762 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	4763 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	4764
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	4765 /* 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	4766 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	4767 _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	4768
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	4769 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	4770
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	4771 /* 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	4772 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	4773
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 /* 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	4775 [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	4776 /* 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	4777 * 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	4778 */
9f12bc79924b Autorelease fixes for Mac allowing the objects to dealloc when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1312 diff changeset	4779 [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	4780 /* 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	4781 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	4782 {
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	4783 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	4784
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	4785 /* 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	4786 * 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	4787 */
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 [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	4789 }
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	4790 /* 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	4791 _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	4792
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 /* 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	4794 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	4795 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	4796 //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	4797 }
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 /*
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	4800 * 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	4801 * Parameters:
1679 e19b93a8229b More comment cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1678 diff changeset	4802 * 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	4803 * 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	4804 * 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	4805 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4806 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	4807 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	4808 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	4809 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	4810 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4811 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	4812 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	4813 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	4814 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	4815
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	4816 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	4817 {
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 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	4819
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	4820 /* 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	4821 * 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	4822 */
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 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	4824 && [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	4825 {
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 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	4827 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	4828 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4829
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	4830 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	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 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	4833 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	4834 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	4835 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	4836
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	4837 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	4838 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	4839
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	4840 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	4841 {
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	4842 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	4843 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	4844 }
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 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	4847 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	4848 else
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4849 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4850 [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	4851 [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	4852
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4853 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	4854 {
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4855 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	4856
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4857 /* 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	4858 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	4859 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4860 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	4861 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4862 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	4863 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4864 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	4865 }
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	4866 }
1955 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 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	4869 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	4870 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	4871 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	4872 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	4873 else
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->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	4875 /* 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	4876 _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	4877 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4878 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4879 }
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	4880 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	4881 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	4882 }
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	4883
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	4884 /*
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	4885 * 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	4886 * 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	4887 * 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	4888 * 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	4889 * Returns:
1679 e19b93a8229b More comment cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1678 diff changeset	4890 * 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	4891 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4892 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	4893 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	4894 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	4895 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	4896 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	4897 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	4898 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	4899 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	4900 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	4901
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	4902 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	4903 {
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 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	4905 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	4906
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	4907 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	4908 {
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 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	4910 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	4911
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	4912 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	4913
1672 42890a2b8d3e Fix minor issues with dw_box_remove_at_index() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1671 diff changeset	4914 if(object)
42890a2b8d3e Fix minor issues with dw_box_remove_at_index() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1671 diff changeset	4915 {
42890a2b8d3e Fix minor issues with dw_box_remove_at_index() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1671 diff changeset	4916 [object retain];
42890a2b8d3e Fix minor issues with dw_box_remove_at_index() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1671 diff changeset	4917 [object removeFromSuperview];
42890a2b8d3e Fix minor issues with dw_box_remove_at_index() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1671 diff changeset	4918 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4919
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	4920 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	4921 {
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	4922 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	4923
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	4924 /* 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	4925 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	4926 {
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	4927 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	4928 }
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	4929 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	4930 {
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 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	4932 }
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	4933 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	4934
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	4935 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	4936 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	4937 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	4938 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	4939 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	4940 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	4941 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	4942
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	4943 /* 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	4944 _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	4945 }
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	4946 }
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	4947 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	4948 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	4949 }
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
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 /*
1086 4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4952 * 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	4953 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4954 * 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	4955 * 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	4956 * 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	4957 * 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	4958 * 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	4959 * 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	4960 * 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	4961 * 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	4962 */
1086 4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4963 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	4964 {
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4965 _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	4966 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4967
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4968 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4969 * 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	4970 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4971 * 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	4972 * 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	4973 * 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	4974 * 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	4975 * 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	4976 * 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	4977 * 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	4978 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4979 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	4980 {
1128 7d7535f6bc4e Added ability to set background color of MLE; setting foreground still outstanding. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1120 diff changeset	4981 /* 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	4982 * 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	4983 */
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4984 _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	4985 }
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4986
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4987 /*
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4988 * 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	4989 * Parameters:
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4990 * 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	4991 * 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	4992 * 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	4993 * 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	4994 * 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	4995 * 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	4996 * 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	4997 */
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	4998 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	4999 {
4254c9b6d50d Merge all 3 box packing functions into one internal function on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1079 diff changeset	5000 _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	5001 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5002
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5003 HWND _button_new(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	5004 {
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	5005 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	5006 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	5007 {
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	5008 [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	5009 }
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	5010 [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	5011 [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	5012 [button setTag:cid];
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	5013 [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	5014 [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	5015 /* 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	5016 [[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	5017 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	5018 {
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	5019 [[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	5020 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5021 return button;
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5022 }
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5023
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5024 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5025 * 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	5026 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5027 * 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	5028 * 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	5029 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5030 HWND API dw_button_new(char *text, ULONG cid)
314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5031 {
314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5032 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	5033 [button setButtonType:DWButtonTypeMomentaryPushIn];
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	5034 [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	5035 [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	5036 [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	5037 [[button cell] setControlTint:NSBlueControlTint];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5038 return button;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5039 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5040
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5041 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5042 * 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	5043 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5044 * 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	5045 * 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	5046 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5047 HWND API dw_entryfield_new(char *text, ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5048 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5049 DWEntryField *entry = [[DWEntryField alloc] init];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5050 [entry setStringValue:[ NSString stringWithUTF8String:text ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5051 [entry setTag:cid];
1712 daa59fc8d6e5 Disable wrapping on entryfields and static text on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1709 diff changeset	5052 [[entry cell] setScrollable:YES];
daa59fc8d6e5 Disable wrapping on entryfields and static text on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1709 diff changeset	5053 [[entry cell] setWraps:NO];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5054 return entry;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5055 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5056
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5057 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5058 * 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	5059 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5060 * 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	5061 * 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	5062 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5063 HWND API dw_entryfield_password_new(char *text, ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5064 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5065 DWEntryFieldPassword *entry = [[DWEntryFieldPassword alloc] init];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5066 [entry setStringValue:[ NSString stringWithUTF8String:text ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5067 [entry setTag:cid];
1712 daa59fc8d6e5 Disable wrapping on entryfields and static text on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1709 diff changeset	5068 [[entry cell] setScrollable:YES];
daa59fc8d6e5 Disable wrapping on entryfields and static text on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1709 diff changeset	5069 [[entry cell] setWraps:NO];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5070 return entry;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5071 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5072
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5073 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5074 * Sets the entryfield character limit.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5075 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5076 * 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	5077 * 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	5078 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5079 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	5080 {
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	5081 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	5082 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	5083
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	5084 [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	5085 [[entry cell] setFormatter:formatter];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5086 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5087
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5088 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5089 * 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	5090 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5091 * 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	5092 * 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	5093 */
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5094 HWND API dw_bitmapbutton_new(char *text, ULONG resid)
0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5095 {
0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5096 NSBundle *bundle = [NSBundle mainBundle];
0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5097 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	5098 NSString *filepath = [respath stringByAppendingFormat:@"/%lu.png", resid];
749 9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	5099 NSImage *image = [[NSImage alloc] initWithContentsOfFile:filepath];
9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	5100 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	5101 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	5102 {
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	5103 [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	5104 }
1396 117cc38a3799 Allow on Mac passing NULL as bubbletext to dw_bitmapbutton_new. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1389 diff changeset	5105 if(text)
117cc38a3799 Allow on Mac passing NULL as bubbletext to dw_bitmapbutton_new. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1389 diff changeset	5106 [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	5107 [image release];
749 9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	5108 return button;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5109 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5110
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5111 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5112 * 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	5113 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5114 * 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	5115 * 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	5116 * 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	5117 * DW pick the appropriate file extension.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5118 * (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	5119 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5120 HWND API dw_bitmapbutton_new_from_file(char text, unsigned long cid, char filename)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5121 {
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	5122 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	5123
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	5124 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	5125 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	5126
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	5127 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	5128 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	5129 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	5130 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	5131 }
749 9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	5132 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	5133 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	5134 {
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	5135 [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	5136 }
1396 117cc38a3799 Allow on Mac passing NULL as bubbletext to dw_bitmapbutton_new. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1389 diff changeset	5137 if(text)
117cc38a3799 Allow on Mac passing NULL as bubbletext to dw_bitmapbutton_new. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1389 diff changeset	5138 [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	5139 [image release];
749 9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	5140 return button;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5141 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5142
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5143 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5144 * 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	5145 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5146 * 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	5147 * 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	5148 * data: The contents of the image
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5149 * (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	5150 * len: length of str
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5151 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5152 HWND API dw_bitmapbutton_new_from_data(char text, unsigned long cid, char data, int len)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5153 {
760 2fb17622a455 Possible fix for exception in dw_bitmapbutton_new_from_data() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 755 diff changeset	5154 NSData *thisdata = [NSData dataWithBytes:data length:len];
749 9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	5155 NSImage *image = [[NSImage alloc] initWithData:thisdata];
9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	5156 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	5157 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	5158 {
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	5159 [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	5160 }
1396 117cc38a3799 Allow on Mac passing NULL as bubbletext to dw_bitmapbutton_new. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1389 diff changeset	5161 if(text)
117cc38a3799 Allow on Mac passing NULL as bubbletext to dw_bitmapbutton_new. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1389 diff changeset	5162 [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	5163 [image release];
749 9e147366147b Code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 748 diff changeset	5164 return button;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5165 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5166
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5167 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5168 * 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	5169 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5170 * 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	5171 * 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	5172 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5173 HWND API dw_spinbutton_new(char *text, ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5174 {
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	5175 DWSpinButton *spinbutton = [[DWSpinButton alloc] init];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5176 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	5177 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	5178 [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	5179 [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	5180 [stepper setMinValue:-65536];
8188f818eb9f Changed initial spinbutton limits to -65536 to 65536 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1018 diff changeset	5181 [stepper setMaxValue:65536];
8188f818eb9f Changed initial spinbutton limits to -65536 to 65536 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1018 diff changeset	5182 [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	5183 [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	5184 return spinbutton;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5185 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5186
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5187 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5188 * Sets the spinbutton value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5189 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5190 * 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	5191 * position: Current value of the spinbutton.
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 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	5194 {
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	5195 DWSpinButton *spinbutton = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5196 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	5197 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	5198 [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	5199 [textfield takeIntValueFrom:stepper];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5200 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5201
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5202 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5203 * Sets the spinbutton limits.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5204 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5205 * 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	5206 * upper: Upper limit.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5207 * lower: Lower limit.
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 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	5210 {
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	5211 DWSpinButton *spinbutton = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5212 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	5213 [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	5214 [stepper setMaxValue:(double)upper];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5215 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5216
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5217 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5218 * 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	5219 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5220 * 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	5221 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5222 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	5223 {
678 0ec8edbb82cf Basic spinbutton implementation, something isn't quite working right but bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 677 diff changeset	5224 DWSpinButton *spinbutton = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5225 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	5226 return (long)[stepper integerValue];
650 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
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5229 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5230 * 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	5231 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5232 * 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	5233 * 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	5234 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5235 HWND API dw_radiobutton_new(char *text, ULONG cid)
314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5236 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5237 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	5238 [button setButtonType:DWButtonTypeRadio];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5239 return button;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5240 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5241
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5242 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5243 * 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	5244 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5245 * 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	5246 * increments: Number of increments available.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5247 * 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	5248 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5249 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	5250 {
704 336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	5251 DWSlider *slider = [[DWSlider alloc] init];
336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	5252 [slider setMaxValue:(double)increments];
336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	5253 [slider setMinValue:0];
336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	5254 [slider setContinuous:YES];
336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	5255 [slider setTarget:slider];
336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	5256 [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	5257 [slider setTag:cid];
704 336800e9e648 Fixes to the slider control so events happen. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 703 diff changeset	5258 return slider;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5259 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5260
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5261 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5262 * Returns the position of the slider.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5263 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5264 * 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	5265 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5266 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	5267 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5268 DWSlider *slider = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5269 double val = [slider doubleValue];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5270 return (int)val;
650 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
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5273 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5274 * Sets the slider position.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5275 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5276 * 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	5277 * 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	5278 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5279 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	5280 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5281 DWSlider *slider = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5282 [slider setDoubleValue:(double)position];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5283 }
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 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5286 * 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	5287 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5288 * 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	5289 * increments: Number of increments available.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5290 * 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	5291 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5292 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	5293 {
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	5294 DWScrollbar *scrollbar;
689 4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	5295 if(vertical)
4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	5296 {
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	5297 scrollbar = [[DWScrollbar alloc] init];
1419 8827e9b14b40 Initial support for automatic window redrawing on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1418 diff changeset	5298 [scrollbar setVertical:YES];
689 4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	5299 }
4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	5300 else
4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	5301 {
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	5302 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	5303 }
1941 b498fb0360fc Mac: 10.14 seems to have drastically changed the drawing mechanism. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1940 diff changeset	5304 #ifndef BUILDING_FOR_YOSEMITE
689 4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	5305 [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	5306 #endif
689 4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	5307 [scrollbar setRange:0.0 andVisible:0.0];
4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	5308 [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	5309 [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	5310 [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	5311 [scrollbar setTag:cid];
689 4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	5312 [scrollbar setEnabled:YES];
4199730e9889 Fixed errors creating scrollbars. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 688 diff changeset	5313 return scrollbar;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5314 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5315
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5316 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5317 * Returns the position of the scrollbar.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5318 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5319 * 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	5320 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5321 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	5322 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5323 DWScrollbar *scrollbar = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5324 float range = [scrollbar range];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5325 float fresult = [scrollbar doubleValue] * range;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5326 return (int)fresult;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5327 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5328
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5329 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5330 * Sets the scrollbar position.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5331 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5332 * 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	5333 * 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	5334 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5335 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	5336 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5337 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	5338 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	5339 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	5340 double newpos = (double)position/(range-visible);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5341 [scrollbar setDoubleValue:newpos];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5342 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5343
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5344 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5345 * Sets the scrollbar range.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5346 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5347 * 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	5348 * range: Maximum range value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5349 * 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	5350 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5351 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	5352 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5353 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	5354 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	5355 [scrollbar setRange:(double)range andVisible:(double)visible];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5356 [scrollbar setKnobProportion:knob];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5357 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5358
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5359 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5360 * 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	5361 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5362 * 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	5363 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5364 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	5365 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5366 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	5367 [percent setStyle:DWProgressIndicatorStyleBar];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5368 [percent setBezeled:YES];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5369 [percent setMaxValue:100];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5370 [percent setMinValue:0];
714 cf6246f86c04 Fixed the percent/progress indicators from always being indeterminate. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 713 diff changeset	5371 [percent incrementBy:1];
cf6246f86c04 Fixed the percent/progress indicators from always being indeterminate. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 713 diff changeset	5372 [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	5373 [percent setDoubleValue:0];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5374 /[percent setTag:cid]; Why doesn't this work? /
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5375 return percent;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5376 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5377
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5378 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5379 * Sets the percent bar position.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5380 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5381 * 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	5382 * 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	5383 */
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	5384 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	5385 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	5386 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	5387 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	5388 {
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	5389 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5390 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	5391
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	5392 /* 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	5393 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	5394 {
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	5395 [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	5396 [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	5397 }
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	5398 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	5399 {
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	5400 /* 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	5401 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	5402 {
698875cfe8e5 Fixed the indeterminate percent bar should be animated on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1190 diff changeset	5403 [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	5404 [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	5405 }
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	5406 [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	5407 }
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	5408 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5409 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5410
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5411 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5412 * 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	5413 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5414 * 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	5415 * 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	5416 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5417 HWND API dw_checkbox_new(char *text, ULONG cid)
314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5418 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5419 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	5420 [button setButtonType:DWButtonTypeSwitch];
ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	5421 [button setBezelStyle:DWBezelStyleRegularSquare];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5422 return button;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5423 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5424
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5425 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5426 * Returns the state of the checkbox.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5427 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5428 * 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	5429 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5430 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	5431 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5432 DWButton *button = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5433 if([button state])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5434 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5435 return TRUE;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5436 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5437 return FALSE;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5438 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5439
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5440 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5441 * Sets the state of the checkbox.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5442 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5443 * 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	5444 * 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	5445 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5446 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	5447 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5448 DWButton *button = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5449 if(value)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5450 {
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	5451 [button setState:DWControlStateValueOn];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5452 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5453 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5454 {
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	5455 [button setState:DWControlStateValueOff];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5456 }
656 6c8b95ca877b Comboboxes implemented. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 655 diff changeset	5457
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5458 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5459
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	5460 /* 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	5461 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	5462 {
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5463 NSScrollView *scrollview = [[NSScrollView alloc] init];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5464 DWContainer *cont = [[DWContainer alloc] init];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5465
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	5466 [cont setScrollview:scrollview];
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	5467 [scrollview setBorderType:NSBezelBorder];
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	5468 [scrollview setHasVerticalScroller:YES];
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	5469 [scrollview setAutohidesScrollers:YES];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5470
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5471 if(multi)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5472 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5473 [cont setAllowsMultipleSelection:YES];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5474 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5475 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5476 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5477 [cont setAllowsMultipleSelection:NO];
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 setDataSource:cont];
813 7fa26d8cc8d0 Fix for column click handler not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 812 diff changeset	5480 [cont setDelegate:cont];
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	5481 [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	5482 [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	5483 [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	5484 [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	5485 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	5486 }
0502e5b6743b Haven't finished but the basics of the container/listbox are now working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 657 diff changeset	5487
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5488 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5489 * 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	5490 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5491 * 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	5492 * multi: Multiple select TRUE or FALSE.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5493 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5494 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	5495 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	5496 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	5497 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	5498 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5499 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5500 DWContainer *cont = _cont_new(cid, multi);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5501 [cont setHeaderView:nil];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5502 int type = DW_CFA_STRING;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5503 [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	5504 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	5505 [column setEditable:NO];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5506 [cont addTableColumn:column];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5507 [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	5508 DW_FUNCTION_RETURN_THIS(cont)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5509 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5510
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5511 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5512 * 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	5513 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5514 * 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	5515 * text: Text to append into listbox.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5516 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5517 DW_FUNCTION_DEFINITION(dw_listbox_append, void, HWND handle, char *text)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5518 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	5519 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	5520 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	5521 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5522 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5523 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5524
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5525 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5526 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5527 DWComboBox *combo = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5528
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5529 [combo addItemWithObjectValue:[ NSString stringWithUTF8String:text ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5530 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5531 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	5532 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5533 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	5534 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	5535 NSArray *newrow = [NSArray arrayWithObject:nstr];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 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 [cont addRow:newrow];
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5538 [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	5539 [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	5540 [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	5541 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5542 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5543 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5544
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5545 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5546 * 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	5547 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5548 * 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	5549 * text: Text to insert into listbox.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5550 * 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	5551 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5552 DW_FUNCTION_DEFINITION(dw_listbox_insert, void, HWND handle, char *text, int pos)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5553 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	5554 DW_FUNCTION_NO_RETURN(dw_listbox_insert)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5555 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, text, char *, pos, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5556 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5557 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5558 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5559
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5560 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5561 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5562 DWComboBox *combo = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5563
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5564 [combo insertItemWithObjectValue:[ NSString stringWithUTF8String:text ] atIndex:pos];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5565 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5566 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	5567 {
687 5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	5568 DWContainer *cont = handle;
5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	5569 NSString *nstr = [ NSString stringWithUTF8String:text ];
5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	5570 NSArray *newrow = [NSArray arrayWithObject:nstr];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5571
687 5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	5572 [cont insertRow:newrow at:pos];
5dde8d34bc69 Implemented dw_listbox_insert for containers. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 686 diff changeset	5573 [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	5574 [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	5575 [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	5576 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5577 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5578 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5579
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5580 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5581 * 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	5582 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5583 * 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	5584 * 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	5585 * 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	5586 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5587 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	5588 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	5589 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	5590 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	5591 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5592 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5593 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5594
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5595 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5596 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5597 DWComboBox *combo = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5598 int z;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5599
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5600 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	5601 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5602 [combo addItemWithObjectValue:[ NSString stringWithUTF8String:text[z] ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5603 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5604 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5605 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	5606 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5607 DWContainer *cont = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5608 int z;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5609
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5610 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	5611 {
1318 ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	5612 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	5613 NSArray *newrow = [NSArray arrayWithObjects:nstr,nil];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5614
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5615 [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	5616 }
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5617 [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	5618 [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	5619 [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	5620 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5621 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5622 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5623
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5624 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5625 * 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	5626 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5627 * 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	5628 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5629 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	5630 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	5631 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	5632 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	5633 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5634 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5635 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5636
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5637 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5638 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5639 DWComboBox *combo = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5640
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5641 [combo removeAllItems];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5642 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5643 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	5644 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5645 DWContainer *cont = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5646
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5647 [cont clear];
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5648 [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	5649 [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	5650 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5651 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5652 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5653
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5654 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5655 * Returns the listbox's item count.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5656 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5657 * 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	5658 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5659 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	5660 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	5661 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	5662 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	5663 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5664 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5665 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	5666 int result = 0;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5667
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5668 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5669 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5670 DWComboBox *combo = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5671
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 result = (int)[combo numberOfItems];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5673 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5674 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	5675 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5676 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	5677 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	5678 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5679 DW_FUNCTION_RETURN_THIS(result);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5680 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5681
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5682 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5683 * 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	5684 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5685 * 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	5686 * top: Index to the top item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5687 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5688 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	5689 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	5690 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	5691 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	5692 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5693 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5694 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5695
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5696 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5697 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5698 DWComboBox *combo = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5699
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5700 [combo scrollItemAtIndexToTop:top];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5701 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5702 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	5703 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5704 DWContainer *cont = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5705
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5706 [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	5707 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5708 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5709 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5710
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5711 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5712 * 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	5713 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5714 * 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	5715 * 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	5716 * 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	5717 * 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	5718 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5719 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	5720 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	5721 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	5722 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	5723 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5724 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5725 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5726
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5727 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5728 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5729 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	5730 int count = (int)[combo numberOfItems];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5731
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	5732 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	5733 {
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	5734 *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	5735 }
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 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	5737 {
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 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	5739 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	5740 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5741 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5742 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	5743 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5744 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	5745 int count = (int)[cont numberOfRowsInTableView:cont];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5746
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	5747 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	5748 {
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	5749 *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	5750 }
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 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	5752 {
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 NSString *nstr = [cont getRow:index and:0];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5754
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	5755 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	5756 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5757 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5758 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5759 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5760
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5761 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5762 * 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	5763 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5764 * 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	5765 * 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	5766 * 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	5767 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5768 DW_FUNCTION_DEFINITION(dw_listbox_set_text, void, HWND handle, unsigned int index, char *buffer)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5769 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	5770 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	5771 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	5772 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5773 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5774 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5775
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5776 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5777 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5778 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	5779 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	5780
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	5781 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	5782 {
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	5783 [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	5784 [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	5785 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5786 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5787 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	5788 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5789 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	5790 int count = (int)[cont numberOfRowsInTableView:cont];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5791
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	5792 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	5793 {
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	5794 NSString *nstr = [ NSString stringWithUTF8String:buffer ];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5795
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 [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	5797 [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	5798 [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	5799 [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	5800 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5801 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5802 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5803 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5804
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5805 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5806 * 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	5807 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5808 * 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	5809 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5810 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	5811 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	5812 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	5813 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	5814 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5815 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5816 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	5817 int result = -1;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5818
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5819 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5820 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5821 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	5822 result = (int)[combo indexOfSelectedItem];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5823 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5824 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	5825 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5826 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	5827 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	5828 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5829 DW_FUNCTION_RETURN_THIS(result);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5830 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5831
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5832 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5833 * 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	5834 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5835 * 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	5836 * 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	5837 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5838 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	5839 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	5840 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	5841 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	5842 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5843 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5844 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	5845 int retval = -1;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5846
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5847 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	5848 {
981 536ec60ee433 Don't destroy a pixmap if the handle is null mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 980 diff changeset	5849 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	5850 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	5851 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	5852 if( where == -1 )
536ec60ee433 Don't destroy a pixmap if the handle is null mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 980 diff changeset	5853 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	5854 else
536ec60ee433 Don't destroy a pixmap if the handle is null mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 980 diff changeset	5855 result = [selected indexGreaterThanIndex:where];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5856
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5857 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	5858 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5859 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	5860 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5861 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5862 DW_FUNCTION_RETURN_THIS(retval)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5863 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5864
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5865 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5866 * 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	5867 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5868 * 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	5869 * index: Item index.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5870 * 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	5871 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5872 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	5873 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	5874 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	5875 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	5876 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5877 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5878 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5879
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5880 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5881 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5882 DWComboBox *combo = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5883 if(state)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5884 [combo selectItemAtIndex:index];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5885 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5886 [combo deselectItemAtIndex:index];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5887 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5888 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	5889 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5890 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	5891 NSIndexSet *selected = [[NSIndexSet alloc] initWithIndex:(NSUInteger)index];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5892
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5893 [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	5894 [selected release];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5895 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5896 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5897 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5898
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5899 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5900 * 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	5901 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5902 * 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	5903 * index: Item index.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5904 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5905 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	5906 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	5907 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	5908 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	5909 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5910 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5911 id object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5912
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5913 if([object isMemberOfClass:[DWComboBox class]])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5914 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5915 DWComboBox *combo = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5916
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5917 [combo removeItemAtIndex:index];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5918 }
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5919 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	5920 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5921 DWContainer *cont = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5922
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	5923 [cont removeRow:index];
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	5924 [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	5925 [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	5926 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5927 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5928 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5929
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5930 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5931 * 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	5932 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5933 * 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	5934 * 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	5935 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5936 DW_FUNCTION_DEFINITION(dw_combobox_new, HWND, char *text, 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	5937 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	5938 DW_FUNCTION_RETURN(dw_combobox_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	5939 DW_FUNCTION_RESTORE_PARAM2(text, char *, 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	5940 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5941 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5942 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	5943 [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	5944 [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	5945 [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	5946 DW_FUNCTION_RETURN_THIS(combo)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5947 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5948
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5949 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5950 * 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	5951 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5952 * 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	5953 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	5954 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	5955 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	5956 DWMLE *mle = [[DWMLE alloc] init];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	5957 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	5958 NSSize size = [mle maxSize];
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	5959
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	5960 size.width = size.height;
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	5961 [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	5962 [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	5963 [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	5964 [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	5965 [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	5966 [scrollview setDocumentView:mle];
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	5967 [mle setVerticallyResizable:YES];
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	5968 [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	5969 [mle setScrollview:scrollview];
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	5970 [mle setAutomaticQuoteSubstitutionEnabled:NO];
a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	5971 [mle setAutomaticDashSubstitutionEnabled:NO];
a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	5972 [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	5973 /* [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	5974 [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	5975 return mle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	5976 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5977
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5978 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5979 * 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	5980 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5981 * 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	5982 * buffer: Text buffer to be imported.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5983 * startpoint: Point to start entering text.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5984 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5985 DW_FUNCTION_DEFINITION(dw_mle_import, unsigned int, HWND handle, char *buffer, int startpoint)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5986 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	5987 DW_FUNCTION_RETURN(dw_mle_import, 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	5988 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, buffer, char *, startpoint, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5989 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	5990 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	5991 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	5992 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	5993 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	5994 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	5995 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	5996 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	5997 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	5998 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	5999 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	6000 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	6001 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	6002 [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	6003 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	6004 DW_FUNCTION_RETURN_THIS(retval);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6005 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6006
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6007 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6008 * Grabs text from an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6009 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6010 * 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	6011 * buffer: Text buffer to be exported.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6012 * startpoint: Point to start grabbing text.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6013 * 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	6014 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6015 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	6016 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	6017 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	6018 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	6019 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6020 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	6021 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	6022 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	6023 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	6024 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	6025 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	6026 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	6027 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6028 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6029
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6030 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6031 * Obtains information about an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6032 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6033 * 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	6034 * 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	6035 * 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	6036 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6037 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	6038 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	6039 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	6040 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	6041 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6042 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	6043 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	6044 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	6045 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	6046 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	6047
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	6048 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	6049 *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	6050 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	6051 {
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	6052 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	6053 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	6054
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	6055 *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	6056 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6057 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6058 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6059
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6060 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6061 * Deletes text from an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6062 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6063 * 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	6064 * startpoint: Point to start deleting text.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6065 * 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	6066 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6067 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	6068 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	6069 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	6070 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	6071 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6072 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	6073 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	6074 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	6075 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	6076 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	6077 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	6078 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	6079 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	6080 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	6081 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	6082 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	6083 [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	6084 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6085 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6086
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6087 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6088 * 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	6089 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6090 * 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	6091 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6092 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	6093 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	6094 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	6095 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	6096 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6097 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	6098 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	6099 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	6100 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	6101 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	6102 [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	6103 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6104 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6105
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6106 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6107 * 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	6108 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6109 * 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	6110 * line: Line to be visible.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6111 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6112 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	6113 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	6114 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	6115 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	6116 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6117 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	6118 DWMLE *mle = handle;
802 676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	6119 NSTextStorage *ts = [mle textStorage];
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	6120 NSMutableString *ms = [ts mutableString];
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	6121 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	6122
802 676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	6123 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	6124 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	6125
802 676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	6126 if(line == numberOfLines)
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	6127 {
676d46b31a11 Initial implementation of dw_mle_set_visible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 801 diff changeset	6128 [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	6129 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6130 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6131 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6132
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6133 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6134 * 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	6135 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6136 * handle: Handle to the MLE.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6137 * 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	6138 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6139 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	6140 {
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	6141 DWMLE *mle = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6142 if(state)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6143 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6144 [mle setEditable:YES];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6145 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6146 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6147 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6148 [mle setEditable:NO];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6149 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6150 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6151
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6152 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6153 * 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	6154 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6155 * handle: Handle to the MLE.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6156 * 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	6157 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6158 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	6159 {
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	6160 DWMLE *mle = handle;
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	6161 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	6162
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	6163 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	6164 {
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	6165 [[mle textContainer] setWidthTracksTextView:YES];
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	6166 [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	6167 }
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	6168 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	6169 {
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	6170 [[mle textContainer] setWidthTracksTextView:NO];
cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	6171 [[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	6172 [mle setHorizontallyResizable:YES];
1551 cf897886ceeb Fixed disabling word wrap in the MLE on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1549 diff changeset	6173 [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	6174 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6175 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6176
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6177 /*
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	6178 * 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	6179 * 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	6180 * 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	6181 * 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	6182 */
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	6183 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	6184 {
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 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	6186 [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	6187 [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	6188 [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	6189 }
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 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6192 * 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	6193 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6194 * 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	6195 * point: Point to position cursor.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6196 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6197 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	6198 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	6199 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	6200 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	6201 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6202 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	6203 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	6204 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	6205 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	6206 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	6207 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	6208 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	6209 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	6210 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	6211 [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	6212 [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	6213 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6214 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6215
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6216 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6217 * Finds text in an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6218 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6219 * 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	6220 * text: Text to search for.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6221 * point: Start point of search.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6222 * flags: Search specific flags.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6223 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6224 DW_FUNCTION_DEFINITION(dw_mle_search, int, HWND handle, char *text, int point, 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	6225 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	6226 DW_FUNCTION_RETURN(dw_mle_search, int)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6227 DW_FUNCTION_RESTORE_PARAM4(handle, HWND, text, char *, point, int, 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	6228 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6229 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	6230 DWMLE *mle = handle;
888 cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	6231 NSTextStorage *ts = [mle textStorage];
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	6232 NSMutableString *ms = [ts mutableString];
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	6233 NSString *searchForMe = [NSString stringWithUTF8String:text];
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	6234 NSRange searchRange = NSMakeRange(point, [ms length] - point);
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	6235 NSRange range = NSMakeRange(NSNotFound, 0);
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	6236 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	6237 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	6238
888 cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	6239 if(ms)
cd6ff038e38b Implemented dw_mle_search on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 887 diff changeset	6240 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	6241 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	6242 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	6243 DW_FUNCTION_RETURN_THIS(retval);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6244 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6245
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6246 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6247 * Stops redrawing of an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6248 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6249 * 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	6250 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6251 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	6252 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6253 /* 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	6254 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6255
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 * Resumes redrawing of an MLE box.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6258 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6259 * 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	6260 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6261 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	6262 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6263 /* 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	6264 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6265
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 * 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	6268 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6269 * 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	6270 * 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	6271 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	6272 HWND API dw_status_text_new(char *text, ULONG cid)
314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	6273 {
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	6274 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	6275 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	6276
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	6277 [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	6278 //[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	6279 [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	6280 [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	6281 [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	6282 [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	6283 [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	6284 [[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	6285 return border;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6286 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6287
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6288 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6289 * 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	6290 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6291 * 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	6292 * 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	6293 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	6294 HWND API dw_text_new(char *text, ULONG cid)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6295 {
1564 d84a690448c3 Attempted fix at border calculation on Mac for status text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1559 diff changeset	6296 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	6297 [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	6298 [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	6299 [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	6300 [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	6301 [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	6302 [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	6303 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	6304 {
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 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	6306 }
1712 daa59fc8d6e5 Disable wrapping on entryfields and static text on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1709 diff changeset	6307 [[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	6308 return textfield;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6309 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6310
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6311 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6312 * 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	6313 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6314 * 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	6315 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6316 * 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	6317 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	6318 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	6319 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6320 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	6321 [render setTag:cid];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6322 return render;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6323 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6324
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6325 /* Sets the current foreground drawing color.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6326 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6327 * red: red value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6328 * green: green value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6329 * blue: blue value.
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 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	6332 {
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	6333 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	6334 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	6335 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	6336
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6337 _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	6338
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	6339 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	6340 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	6341 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	6342 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	6343 [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	6344 DW_LOCAL_POOL_OUT;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6345 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6346
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6347 /* Sets the current background drawing color.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6348 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6349 * red: red value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6350 * green: green value.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6351 * blue: blue value.
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 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	6354 {
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	6355 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	6356 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	6357 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	6358
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	6359 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	6360 {
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	6361 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	6362 }
3774af45eb0c Fix for dw_draw_text() not using the background color on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 890 diff changeset	6363 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	6364 {
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 _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	6366
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	6367 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	6368 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	6369 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	6370 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	6371 }
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	6372 [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	6373 DW_LOCAL_POOL_OUT;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6374 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6375
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6376 /* 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	6377 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6378 * value: current color
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6379 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6380 * 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	6381 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6382 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	6383 {
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	6384 /* 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	6385 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	6386 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	6387 DW_LOCAL_POOL_IN;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6388
1644 2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	6389 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	6390 {
733 8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	6391 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	6392 /* 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	6393 [colorDlg setContinuous:NO];
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6394 [colorDlg setTarget:colorDlg];
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6395 [colorDlg setAction:@selector(changeColor:)];
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6396 }
1644 2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	6397 else
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	6398 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	6399
1644 2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	6400 /* 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	6401 if([colorDlg dialog])
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	6402 {
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	6403 DW_LOCAL_POOL_OUT;
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	6404 return value;
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	6405 }
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	6406
2b55465887e1 Color chooser changes for Lion compatibility on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1610 diff changeset	6407 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	6408 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	6409 [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	6410
733 8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	6411 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	6412 [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	6413 [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	6414
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	6415 /* 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	6416 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	6417
732 db3a173e487e Fixes for the color chooser... it now works a single time. However... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 731 diff changeset	6418 /* 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	6419 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	6420 [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	6421 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	6422 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	6423 return value;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6424 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6425
1938 5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	6426 /* 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	6427 * 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	6428 */
5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	6429 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	6430 {
5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	6431 #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	6432 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	6433 #else
5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	6434 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	6435 #endif
5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	6436 }
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	6437
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6438 /* 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	6439 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6440 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6441 * 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	6442 * x: X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6443 * y: Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6444 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6445 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	6446 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	6447 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	6448 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	6449 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6450 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	6451 DW_LOCAL_POOL_IN;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6452 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	6453 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	6454 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	6455
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6456 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	6457 bi = image = (id)pixmap->image;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6458 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6459 {
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	6460 #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	6461 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	6462 {
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 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	6464
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	6465 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	6466 }
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 #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	6468 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	6469 _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	6470 #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	6471 }
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 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	6473 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6474 [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	6475 [NSGraphicsContext setCurrentContext:_dw_draw_context(bi)];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6476 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6477 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	6478 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6479 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	6480 [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	6481 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	6482 [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	6483
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6484 [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	6485 [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	6486 }
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	6487 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	6488 [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	6489 #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	6490 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	6491 [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	6492 #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	6493 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	6494 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6495 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6496
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6497 /* 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	6498 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6499 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6500 * 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	6501 * x1: First X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6502 * y1: First Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6503 * x2: Second X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6504 * y2: Second Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6505 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6506 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	6507 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	6508 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	6509 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	6510 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6511 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	6512 DW_LOCAL_POOL_IN;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6513 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	6514 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	6515 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	6516
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6517 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	6518 bi = image = (id)pixmap->image;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6519 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6520 {
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	6521 #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	6522 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	6523 {
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 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	6525
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	6526 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	6527 }
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 #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	6529 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	6530 _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	6531 #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	6532 }
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 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	6534 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6535 [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	6536 [NSGraphicsContext setCurrentContext:_dw_draw_context(bi)];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6537 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6538 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	6539 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6540 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	6541 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	6542 [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	6543
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6544 [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	6545 [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	6546 [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	6547 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	6548
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	6549 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	6550 [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	6551 #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	6552 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	6553 [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	6554 #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	6555 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	6556 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6557 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6558
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6559 /* 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	6560 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6561 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6562 * 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	6563 * x: X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6564 * y: Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6565 * text: Text to be displayed.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6566 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6567 DW_FUNCTION_DEFINITION(dw_draw_text, void, HWND handle, HPIXMAP pixmap, int x, int y, char *text)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6568 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	6569 DW_FUNCTION_NO_RETURN(dw_draw_text)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6570 DW_FUNCTION_RESTORE_PARAM5(handle, HWND, pixmap, HPIXMAP, x, int, y, int, 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	6571 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6572 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	6573 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	6574 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	6575 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	6576 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	6577 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	6578 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	6579 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	6580
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	6581 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	6582 {
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	6583 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	6584 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	6585 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	6586 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	6587 {
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 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	6589 }
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	6590 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	6591 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6592 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	6593 {
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6594 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	6595 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	6596 #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	6597 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	6598 #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	6599 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	6600 _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	6601 #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	6602 }
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 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	6604 {
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	6605 [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	6606 [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	6607 }
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
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6609 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	6610 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6611 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	6612 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	6613 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	6614 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	6615 [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	6616 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	6617 [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	6618 [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	6619 [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	6620 }
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	6621
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6622 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	6623 [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	6624 #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	6625 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	6626 [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	6627 #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	6628 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	6629 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6630 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6631
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6632 /* 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	6633 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6634 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6635 * 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	6636 * text: Text to be queried.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6637 * 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	6638 * 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	6639 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6640 void API dw_font_text_extents_get(HWND handle, HPIXMAP pixmap, char text, int width, int *height)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6641 {
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	6642 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	6643 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	6644 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	6645 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	6646
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	6647 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	6648
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	6649 /* 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	6650 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	6651 {
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	6652 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	6653 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	6654 }
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	6655 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	6656 /* 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	6657 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	6658 {
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 = [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	6660 }
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	6661 /* 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	6662 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	6663 {
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 [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	6665 }
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 /* 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	6667 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	6668 [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	6669 /* 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	6670 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	6671 {
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	6672 *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	6673 }
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	6674 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	6675 {
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 *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	6677 }
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	6678 DW_LOCAL_POOL_OUT;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6679 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6680
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	6681 /* 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	6682 * 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	6683 */
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	6684 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	6685 {
1938 5a88fff43d99 Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1936 diff changeset	6686 #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	6687 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	6688 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	6689 #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	6690 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	6691 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	6692 #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	6693 [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	6694 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	6695 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	6696 }
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
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6698 /* 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	6699 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6700 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6701 * 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	6702 * 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	6703 * x: X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6704 * y: Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6705 * width: Width of rectangle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6706 * height: Height of rectangle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6707 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6708 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	6709 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	6710 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	6711 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	6712 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6713 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	6714 DW_LOCAL_POOL_IN;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6715 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	6716 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	6717 bool bCanDraw = YES;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6718 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	6719
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6720 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	6721 bi = image = (id)pixmap->image;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6722 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6723 {
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	6724 #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	6725 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	6726 {
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 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	6728
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	6729 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	6730 }
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 #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	6732 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	6733 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6734 _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	6735 [[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	6736 }
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	6737 #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	6738 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6739 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	6740 {
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	6741 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	6742 [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	6743 [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	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
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6746 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	6747 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6748 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	6749 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	6750 [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	6751
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6752 [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	6753 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	6754 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6755 [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	6756 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6757 [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	6758 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	6759 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6760 [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	6761 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6762 [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	6763 }
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	6764
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	6765 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	6766 [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	6767 #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	6768 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	6769 [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	6770 #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	6771 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	6772 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6773 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6774
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6775 /* 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	6776 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6777 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6778 * 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	6779 * 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	6780 * x: X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6781 * y: Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6782 * width: Width of rectangle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6783 * height: Height of rectangle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6784 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6785 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	6786 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	6787 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	6788 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	6789 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6790 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	6791 DW_LOCAL_POOL_IN;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6792 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	6793 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	6794 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	6795
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6796 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	6797 bi = image = (id)pixmap->image;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6798 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6799 {
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	6800 #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	6801 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	6802 {
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 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	6804
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	6805 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	6806 }
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 #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	6808 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	6809 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6810 _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	6811 [[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	6812 }
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	6813 #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	6814 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6815 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	6816 {
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	6817 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	6818 [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	6819 [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	6820 }
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	6821
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6822 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	6823 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6824 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	6825 [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	6826
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6827 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	6828 [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	6829 else
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6830 [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	6831 }
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	6832
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	6833 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	6834 [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	6835 #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	6836 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	6837 [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	6838 #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	6839 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	6840 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6841 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6842
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	6843 /* 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	6844 * Parameters:
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	6845 * 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	6846 * 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	6847 * 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	6848 * 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	6849 * 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	6850 * 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	6851 * 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	6852 * 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	6853 * 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	6854 * 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	6855 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6856 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	6857 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	6858 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	6859 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	6860 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6861 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	6862 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	6863 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	6864 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	6865 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	6866
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	6867 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	6868 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	6869 else
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	6870 {
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	6871 #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	6872 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	6873 {
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 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	6875
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	6876 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	6877 }
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 #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	6879 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	6880 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6881 _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	6882 [[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	6883 }
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	6884 #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	6885 }
42f1e323849c Mac: Massive rewrite to the drawing code in an attempt to get NSView bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1945 diff changeset	6886 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	6887 {
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	6888 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	6889 [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	6890 [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	6891 }
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	6892
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6893 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	6894 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6895 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	6896 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	6897 [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	6898
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6899 /* 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	6900 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	6901 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6902 [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	6903 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6904 else
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6905 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6906 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	6907 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	6908 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	6909 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	6910 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	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 /* 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	6913 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	6914 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	6915
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6916 /* 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	6917 [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	6918 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	6919 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6920 /* 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	6921 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	6922 {
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 fill];
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6924 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6925 /* 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	6926 [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	6927 }
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	6928
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	6929 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	6930 [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	6931 #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	6932 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	6933 [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	6934 #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	6935 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	6936 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	6937 }
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1247 diff changeset	6938
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6939 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6940 * 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	6941 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6942 * 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	6943 * resource file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6944 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6945 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	6946 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	6947 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	6948 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	6949 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6950 DW_FUNCTION_INIT;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6951 NSScrollView *scrollview = [[NSScrollView alloc] init];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6952 DWTree *tree = [[DWTree alloc] init];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6953
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	6954 [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	6955 [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	6956 [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	6957 [scrollview setAutohidesScrollers:YES];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	6958
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	6959 [tree setAllowsMultipleSelection:NO];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	6960 [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	6961 [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	6962 [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	6963 [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	6964 [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	6965 [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	6966 DW_FUNCTION_RETURN_THIS(tree);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6967 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6968
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6969 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6970 * 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	6971 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6972 * 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	6973 * 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	6974 * 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	6975 * icon: Handle to coresponding icon.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6976 * 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	6977 * itemdata: Item specific data.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6978 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6979 DW_FUNCTION_DEFINITION(dw_tree_insert_after, HTREEITEM, HWND handle, HTREEITEM item, char title, HICN icon, HTREEITEM parent, 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	6980 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	6981 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	6982 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	6983 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	6984 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	6985 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	6986 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	6987 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	6988 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	6989 [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	6990 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	6991 [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	6992 [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	6993 [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	6994 [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	6995 [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	6996 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	6997 [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	6998 else
2ebaea72ac95 Fix for some release calls causing issues on MacOS 10.7 Lion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1061 diff changeset	6999 [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	7000 DW_FUNCTION_RETURN_THIS(treenode);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7001 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7002
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7003 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7004 * 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	7005 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7006 * 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	7007 * 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	7008 * icon: Handle to coresponding icon.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7009 * 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	7010 * itemdata: Item specific data.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7011 */
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	7012 HTREEITEM API dw_tree_insert(HWND handle, 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	7013 {
680 db315779a283 Initial tree support, lots more to do but basics are there. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 679 diff changeset	7014 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	7015 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7016
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7017 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7018 * 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	7019 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7020 * 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	7021 * 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	7022 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7023 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	7024 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	7025 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	7026 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	7027 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7028 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	7029 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	7030 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	7031 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	7032 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	7033 DW_FUNCTION_RETURN_THIS(retval);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7034 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7035
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7036 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7037 * 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	7038 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7039 * 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	7040 * 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	7041 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7042 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	7043 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	7044 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	7045 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	7046 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7047 DW_FUNCTION_INIT;
881 7b2750744552 Implemented dw_tree_get_parent() for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 873 diff changeset	7048 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	7049 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	7050
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	7051 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	7052 DW_FUNCTION_RETURN_THIS(parent);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7053 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7054
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7055 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7056 * 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	7057 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7058 * 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	7059 * 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	7060 * 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	7061 * icon: Handle to coresponding icon.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7062 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7063 DW_FUNCTION_DEFINITION(dw_tree_item_change, void, HWND handle, HTREEITEM item, char *title, HICN icon)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7064 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	7065 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	7066 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	7067 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7068 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	7069 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	7070 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	7071 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	7072
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	7073 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	7074 {
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	7075 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	7076 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	7077 [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	7078 [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	7079 }
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 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	7081 {
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	7082 [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	7083 }
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	7084 [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	7085 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	7086 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7087 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7088
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7089 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7090 * 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	7091 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7092 * 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	7093 * 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	7094 * 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	7095 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7096 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	7097 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	7098 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	7099 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	7100 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7101 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	7102 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	7103 [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	7104 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7105 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7106
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7107 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7108 * 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	7109 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7110 * 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	7111 * 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	7112 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7113 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	7114 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	7115 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	7116 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	7117 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7118 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	7119 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	7120 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	7121 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	7122 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	7123 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	7124 DW_FUNCTION_RETURN_THIS(result);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7125 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7126
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7127 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7128 * 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	7129 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7130 * 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	7131 * 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	7132 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7133 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	7134 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	7135 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	7136 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	7137 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7138 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	7139 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	7140 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	7141 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	7142 {
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	7143 [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	7144 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7145 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7146 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7147
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7148 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7149 * Removes all nodes from a tree.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7150 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7151 * 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	7152 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7153 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	7154 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	7155 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	7156 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	7157 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7158 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	7159 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	7160 [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	7161 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7162 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7163
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7164 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7165 * Expands a node on a tree.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7166 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7167 * 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	7168 * 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	7169 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7170 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	7171 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	7172 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	7173 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	7174 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7175 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	7176 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	7177 [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	7178 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7179 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7180
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7181 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7182 * Collapses a node on a tree.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7183 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7184 * 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	7185 * 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	7186 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7187 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	7188 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	7189 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	7190 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	7191 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7192 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	7193 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	7194 [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	7195 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7196 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7197
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7198 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7199 * Removes a node from a tree.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7200 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7201 * 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	7202 * 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	7203 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7204 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	7205 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	7206 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	7207 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	7208 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7209 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	7210 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	7211 [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	7212 [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	7213 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7214 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7215
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7216 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7217 * 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	7218 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7219 * 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	7220 * resource file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7221 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7222 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	7223 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	7224 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	7225 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	7226 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7227 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	7228 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	7229 NSScrollView *scrollview = [cont scrollview];
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	7230 [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	7231 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	7232 [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	7233 [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	7234 [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	7235 DW_FUNCTION_RETURN_THIS(cont);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7236 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7237
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7238 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7239 * Sets up the container columns.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7240 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7241 * 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	7242 * 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	7243 * 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	7244 * 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	7245 * 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	7246 * (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	7247 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7248 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	7249 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	7250 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	7251 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	7252 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7253 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	7254 int z, retval = DW_ERROR_NONE;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7255 DWContainer *cont = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7256
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7257 [cont setup];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7258
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7259 for(z=0;z<count;z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7260 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7261 NSTableColumn *column = [[NSTableColumn alloc] init];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7262 [[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	7263 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	7264 {
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	7265 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	7266 [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	7267 [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	7268 }
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	7269 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	7270 {
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	7271 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	7272 [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	7273 [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	7274 }
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 /* 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	7276 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	7277 {
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	7278 [(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	7279 [(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	7280 }
3872ab37297b Fix numerous deprecation warnings building with SDK 10.12 Sierra. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1908 diff changeset	7281 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	7282 {
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	7283 [(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	7284 [(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	7285 }
795 f23cad02cfb3 Make listbox, container and tree cells uneditable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 794 diff changeset	7286 [column setEditable:NO];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7287 [cont addTableColumn:column];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7288 [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	7289 [column release];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7290 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7291 DW_FUNCTION_RETURN_THIS(retval);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7292 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7293
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7294 /*
1744 535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7295 * 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	7296 * Parameters:
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7297 * 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	7298 * 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	7299 */
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7300 void API dw_filesystem_set_column_title(HWND handle, char *title)
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7301 {
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7302 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	7303
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7304 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	7305 }
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7306
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7307 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7308 * 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	7309 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7310 * 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	7311 * 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	7312 * 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	7313 * 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	7314 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7315 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	7316 {
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	7317 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	7318 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	7319 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	7320 DWContainer *cont = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7321
1744 535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7322 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	7323
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 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	7325
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	7326 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	7327 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	7328
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 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	7330 [cont setFilesystem:YES];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7331
1744 535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7332 if(coltitle)
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7333 {
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7334 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	7335 free(coltitle);
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1740 diff changeset	7336 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7337 free(newtitles);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7338 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	7339 return DW_ERROR_NONE;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7340 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7341
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7342 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7343 * 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	7344 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7345 * 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	7346 * 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	7347 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7348 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	7349 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	7350 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	7351 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	7352 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7353 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7354 DWContainer *cont = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7355 [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	7356 DW_FUNCTION_RETURN_THIS(cont);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7357 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7358
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7359 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7360 * 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	7361 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7362 * 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	7363 * 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	7364 * 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	7365 * 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	7366 * 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	7367 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7368 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	7369 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	7370 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	7371 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	7372 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7373 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7374 DWContainer *cont = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7375 id object = nil;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7376 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	7377 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	7378
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	7379 /* 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	7380 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	7381 {
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	7382 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	7383 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7384
1502 dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7385 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	7386 {
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7387 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	7388 {
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7389 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	7390 }
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7391 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	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 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	7394 object = [ NSString stringWithUTF8String:str ];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7395 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7396 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7397 {
1502 dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7398 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	7399
1502 dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7400 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	7401 {
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7402 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	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 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	7405 }
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7406 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	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 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	7409 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	7410
1502 dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7411 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	7412 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	7413 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	7414 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	7415
1502 dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7416 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	7417 }
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7418 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	7419 {
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7420 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	7421 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	7422
1502 dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7423 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	7424 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	7425 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	7426 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	7427
1502 dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7428 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	7429 }
dc41efe8a53f Allow passing NULL to dw_container_change/set_item() APIs on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1498 diff changeset	7430 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	7431 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	7432 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7433 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	7434
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7435 [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	7436 [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	7437 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7438 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7439
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7440 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7441 * 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	7442 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7443 * 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	7444 * 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	7445 * 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	7446 * 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	7447 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7448 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	7449 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7450 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	7451 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7452
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 * 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	7455 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7456 * 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	7457 * 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	7458 * 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	7459 * 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	7460 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7461 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	7462 {
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	7463 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	7464 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7465
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 * 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	7468 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7469 * 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	7470 * 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	7471 * 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	7472 * 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	7473 * 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	7474 */
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	7475 void API dw_filesystem_change_file(HWND handle, int row, char *filename, HICN icon)
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	7476 {
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	7477 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	7478 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7479
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7480 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7481 * 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	7482 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7483 * 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	7484 * 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	7485 * 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	7486 * 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	7487 * 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	7488 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7489 DW_FUNCTION_DEFINITION(dw_filesystem_set_file, void, HWND handle, void pointer, int row, char filename, HICN icon)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7490 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	7491 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	7492 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	7493 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7494 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	7495 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	7496 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	7497 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	7498
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	7499 /* 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	7500 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	7501 {
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	7502 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	7503 }
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
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	7505 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	7506 [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	7507 [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	7508 [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	7509 [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	7510 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7511 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7512
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7513 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7514 * 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	7515 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7516 * 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	7517 * 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	7518 * 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	7519 * 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	7520 * 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	7521 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7522 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	7523 {
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	7524 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	7525 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7526
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 * 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	7529 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7530 * 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	7531 * column: Zero based column.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7532 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7533 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	7534 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	7535 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	7536 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	7537 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7538 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	7539 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	7540 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	7541 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	7542 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	7543 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	7544 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	7545 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	7546 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	7547 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	7548 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	7549 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	7550 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	7551 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	7552 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	7553 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	7554 DW_FUNCTION_RETURN_THIS(rc);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7555 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7556
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7557 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7558 * 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	7559 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7560 * 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	7561 * column: Zero based column.
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 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	7564 {
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	7565 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	7566 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7567
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7568 /*
1206 c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	7569 * 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	7570 * Parameters:
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	7571 * 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	7572 * 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	7573 * 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	7574 * 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	7575 * 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	7576 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7577 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	7578 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	7579 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	7580 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	7581 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7582 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	7583 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	7584 [cont setRowBgOdd:oddcolor
45abd53a3fc6 Mac: Moved even/odd color code into DWContainer class since bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1957 diff changeset	7585 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	7586 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	7587 }
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	7588
c7bb48cda53a Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1204 diff changeset	7589 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7590 * 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	7591 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7592 * 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	7593 * 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	7594 * width: Width of column in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7595 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7596 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	7597 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	7598 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	7599 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	7600 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7601 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	7602 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	7603 if([cont filesystem])
168b9db65825 Minor fix for dw_container_column_set_width() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 829 diff changeset	7604 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	7605 NSTableColumn *col = [cont getColumn:column];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7606
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	7607 [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	7608 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7609 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7610
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7611 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7612 * 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	7613 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7614 * 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	7615 * 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	7616 * title: String title of the item.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7617 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7618 DW_FUNCTION_DEFINITION(dw_container_set_row_title, void, void pointer, int row, char title)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7619 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	7620 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	7621 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	7622 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7623 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7624 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	7625 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	7626 [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	7627 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	7628 }
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	7629
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	7630
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 /*
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7632 * 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	7633 * Parameters:
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7634 * 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	7635 * 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	7636 * 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	7637 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7638 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	7639 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	7640 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	7641 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	7642 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7643 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	7644 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	7645 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	7646 [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	7647 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	7648 }
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7649
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7650
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7651 /*
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	7652 * 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	7653 * 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	7654 * 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	7655 * 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	7656 * 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	7657 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7658 DW_FUNCTION_DEFINITION(dw_container_change_row_title, void, HWND handle, int row, char *title)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7659 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	7660 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	7661 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	7662 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7663 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	7664 DWContainer *cont = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7665 [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	7666 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7667 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7668
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7669 /*
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7670 * 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	7671 * Parameters:
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7672 * 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	7673 * 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	7674 * 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	7675 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7676 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	7677 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	7678 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	7679 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	7680 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7681 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	7682 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	7683 [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	7684 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	7685 }
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7686
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7687 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7688 * 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	7689 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7690 * 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	7691 * 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	7692 * 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	7693 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7694 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	7695 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	7696 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	7697 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	7698 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7699 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7700 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	7701 [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	7702 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7703 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7704
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7705 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7706 * Removes all rows from a container.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7707 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7708 * 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	7709 * 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	7710 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7711 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	7712 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	7713 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	7714 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	7715 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7716 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7717 DWContainer *cont = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	7718 [cont clear];
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	7719 if(redraw)
0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	7720 [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	7721 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7722 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7723
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7724 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7725 * 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	7726 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7727 * 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	7728 * 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	7729 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7730 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	7731 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	7732 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	7733 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	7734 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7735 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	7736 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	7737 int x;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7738
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	7739 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	7740 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	7741 [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	7742 }
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	7743 [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	7744 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7745 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7746
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7747 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7748 * Scrolls container up or down.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7749 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7750 * 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	7751 * 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	7752 * 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	7753 * 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	7754 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7755 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	7756 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	7757 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	7758 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	7759 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7760 DW_FUNCTION_INIT;
837 89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	7761 DWContainer *cont = handle;
89d4bad9c96e Initial attempt at implementing the scrollbox on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 831 diff changeset	7762 NSScrollView *sv = [cont scrollview];
852 bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7763 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	7764 int rowcount = (int)[cont numberOfRowsInTableView:cont];
852 bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7765 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	7766 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	7767
853 c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	7768 /* Safety check */
c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	7769 if(rowcount < 1)
c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	7770 {
c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	7771 return;
c27ce204302b Add safety check to avoid potential divide by zero. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 852 diff changeset	7772 }
938 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 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	7775
852 bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7776 switch(direction)
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7777 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7778 case DW_SCROLL_TOP:
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7779 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7780 [scrollbar setFloatValue:0];
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7781 break;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7782 }
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7783 case DW_SCROLL_BOTTOM:
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7784 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7785 [scrollbar setFloatValue:1];
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7786 break;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7787 }
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7788 case DW_SCROLL_UP:
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7789 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7790 float newpos = currpos - change;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7791 if(newpos < 0)
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7792 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7793 newpos = 0;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7794 }
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7795 [scrollbar setFloatValue:newpos];
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7796 break;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7797 }
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7798 case DW_SCROLL_DOWN:
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7799 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7800 float newpos = currpos + change;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7801 if(newpos > 1)
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7802 {
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7803 newpos = 1;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7804 }
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7805 [scrollbar setFloatValue:newpos];
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7806 break;
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7807 }
bb582f89007a Implemented dw_container_scroll() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 851 diff changeset	7808 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7809 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7810 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7811
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7812 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7813 * 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	7814 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7815 * 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	7816 * 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	7817 * 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	7818 * 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	7819 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7820 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	7821 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	7822 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	7823 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	7824 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7825 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	7826 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	7827 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	7828 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	7829 void *retval = NULL;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7830
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	7831 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	7832 {
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7833 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	7834 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	7835 else
1885 0768bbcf67e5 Need to duplicate container query results on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1874 diff changeset	7836 {
0768bbcf67e5 Need to duplicate container query results on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1874 diff changeset	7837 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	7838 if(temp)
0768bbcf67e5 Need to duplicate container query results on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1874 diff changeset	7839 retval = strdup(temp);
0768bbcf67e5 Need to duplicate container query results on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1874 diff changeset	7840 }
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	7841 [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	7842 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7843 DW_FUNCTION_RETURN_THIS(retval);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7844 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7845
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7846 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7847 * 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	7848 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7849 * 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	7850 * 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	7851 * 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	7852 * 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	7853 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7854 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	7855 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	7856 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	7857 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	7858 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7859 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	7860 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	7861 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	7862 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	7863 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	7864 void *retval = NULL;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7865
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 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	7867 {
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7868 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	7869 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	7870 else
1885 0768bbcf67e5 Need to duplicate container query results on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1874 diff changeset	7871 {
0768bbcf67e5 Need to duplicate container query results on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1874 diff changeset	7872 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	7873 if(temp)
0768bbcf67e5 Need to duplicate container query results on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1874 diff changeset	7874 retval = strdup(temp);
0768bbcf67e5 Need to duplicate container query results on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1874 diff changeset	7875 }
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	7876 [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	7877 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7878 DW_FUNCTION_RETURN_THIS(retval);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7879 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7880
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7881 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7882 * 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	7883 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7884 * 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	7885 * 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	7886 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7887 DW_FUNCTION_DEFINITION(dw_container_cursor, void, HWND handle, char *text)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7888 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	7889 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	7890 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	7891 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7892 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	7893 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	7894 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	7895 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	7896 int x, count = (int)[cont numberOfRowsInTableView:cont];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7897
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	7898 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	7899 {
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 thistext = [cont getRowTitle:x];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7901
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7902 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	7903 {
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 NSIndexSet *selected = [[NSIndexSet alloc] initWithIndex:(NSUInteger)x];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7905
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	7906 [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	7907 [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	7908 [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	7909 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	7910 break;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7911 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7912 }
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	7913 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	7914 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7915 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7916
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7917 /*
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7918 * 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	7919 * Parameters:
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7920 * 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	7921 * 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	7922 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7923 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	7924 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	7925 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	7926 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	7927 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7928 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	7929 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	7930 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	7931 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	7932 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	7933
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7934 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	7935 {
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7936 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	7937
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7938 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	7939 {
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7940 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	7941
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7942 [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	7943 [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	7944 [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	7945 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	7946 break;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7947 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7948 }
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7949 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	7950 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	7951 }
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7952
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7953 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7954 * 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	7955 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7956 * handle: Handle to the window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7957 * 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	7958 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7959 DW_FUNCTION_DEFINITION(dw_container_delete_row, void, HWND handle, char *text)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7960 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	7961 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	7962 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	7963 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7964 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	7965 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	7966 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	7967 int x, count = (int)[cont numberOfRowsInTableView:cont];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7968
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	7969 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	7970 {
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 thistext = [cont getRowTitle:x];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	7972
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7973 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	7974 {
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7975 [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	7976 [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	7977 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	7978 break;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7979 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7980 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7981 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	7982 }
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7983
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7984 /*
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7985 * 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	7986 * Parameters:
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	7987 * 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	7988 * 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	7989 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7990 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	7991 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	7992 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	7993 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	7994 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	7995 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	7996 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	7997 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	7998 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	7999
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	8000 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	8001 {
3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	8002 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	8003
1871 3f571ad9b92e First Mac round of changes aimed at separating the data and text bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1862 diff changeset	8004 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	8005 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	8006 [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	8007 [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	8008 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	8009 break;
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8010 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8011 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8012 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8013 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8014
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8015 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8016 * 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	8017 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8018 * 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	8019 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8020 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	8021 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	8022 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	8023 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	8024 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8025 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8026 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	8027 [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	8028 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8029 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8030
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8031 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8032 * Inserts an icon into the taskbar.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8033 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8034 * 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	8035 * 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	8036 * 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	8037 */
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	8038 void API dw_taskbar_insert(HWND handle, HICN icon, char *bubbletext)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8039 {
1943 469711814566 Mac: Fix NSStatusItem deprecation warnings by using the embedded NSStatusBarButton instead. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1942 diff changeset	8040 #ifdef BUILDING_FOR_YOSEMITE
1220 67ff39b9577c Initial implementation of dw_taskbar_* for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1215 diff changeset	8041 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	8042 NSStatusBarButton *button = [item button];
1220 67ff39b9577c Initial implementation of dw_taskbar_* for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1215 diff changeset	8043 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	8044 [button setImage:image];
1220 67ff39b9577c Initial implementation of dw_taskbar_* for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1215 diff changeset	8045 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	8046 [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	8047 [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	8048 [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	8049 [[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	8050 [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	8051 [button setAction:@selector(mouseDown:)];
1220 67ff39b9577c Initial implementation of dw_taskbar_* for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1215 diff changeset	8052 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	8053 #endif
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8054 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8055
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8056 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8057 * Deletes an icon from the taskbar.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8058 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8059 * 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	8060 * 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	8061 */
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	8062 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	8063 {
1943 469711814566 Mac: Fix NSStatusItem deprecation warnings by using the embedded NSStatusBarButton instead. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1942 diff changeset	8064 #ifdef BUILDING_FOR_YOSEMITE
1220 67ff39b9577c Initial implementation of dw_taskbar_* for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1215 diff changeset	8065 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	8066 DW_LOCAL_POOL_IN;
1220 67ff39b9577c Initial implementation of dw_taskbar_* for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1215 diff changeset	8067 [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	8068 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	8069 #endif
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8070 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8071
1708 cc10082567ed Similar code for Mac to keep HICNs from getting too big. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1705 diff changeset	8072 /* 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	8073 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	8074 {
1709 de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1708 diff changeset	8075 if(image)
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1708 diff changeset	8076 {
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1708 diff changeset	8077 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	8078 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	8079 {
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1708 diff changeset	8080 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	8081 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	8082 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	8083 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	8084 [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	8085 }
1708 cc10082567ed Similar code for Mac to keep HICNs from getting too big. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1705 diff changeset	8086 }
cc10082567ed Similar code for Mac to keep HICNs from getting too big. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1705 diff changeset	8087 }
cc10082567ed Similar code for Mac to keep HICNs from getting too big. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1705 diff changeset	8088
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	8089 /* 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	8090 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	8091 {
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	8092 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	8093 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	8094 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	8095 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	8096 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	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
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8099 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8100 * 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	8101 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8102 * 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	8103 * 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	8104 * 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	8105 * to an embedded XPM.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8106 */
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	8107 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	8108 {
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	8109 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	8110 _icon_resize(image);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8111 return image;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8112 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8113
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8114 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8115 * Obtains an icon from a file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8116 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8117 * 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	8118 * DW pick the appropriate file extension.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8119 * (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	8120 */
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	8121 HICN API dw_icon_load_from_file(char *filename)
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	8122 {
938 cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	8123 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	8124
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	8125 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	8126 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	8127 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	8128 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	8129 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	8130 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	8131 }
1708 cc10082567ed Similar code for Mac to keep HICNs from getting too big. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1705 diff changeset	8132 _icon_resize(image);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8133 return image;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8134 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8135
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8136 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8137 * Obtains an icon from data
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8138 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8139 * 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	8140 * DW pick the appropriate file extension.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8141 * (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	8142 */
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	8143 HICN API dw_icon_load_from_data(char *data, int len)
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	8144 {
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8145 NSData *thisdata = [NSData dataWithBytes:data length:len];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8146 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	8147 _icon_resize(image);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8148 return image;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8149 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8150
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8151 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8152 * 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	8153 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8154 * 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	8155 */
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	8156 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	8157 {
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	8158 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	8159 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	8160 [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	8161 DW_LOCAL_POOL_OUT;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8162 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8163
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8164 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8165 * 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	8166 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8167 * 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	8168 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	8169 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	8170 {
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	8171 /* 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	8172 * 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	8173 * when the application is deactivated to simulate
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8174 * 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	8175 */
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	8176 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	8177 /* [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	8178 return mdi;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8179 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8180
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8181 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8182 * 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	8183 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8184 * 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	8185 * 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	8186 * 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	8187 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8188 * 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	8189 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8190 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	8191 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	8192 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	8193 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	8194 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8195 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	8196 id tmpbox = dw_box_new(DW_VERT, 0);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8197 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	8198 [split setDelegate:split];
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	8199 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	8200 [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	8201 [tmpbox autorelease];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8202 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	8203 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	8204 [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	8205 [tmpbox autorelease];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8206 if(type == DW_VERT)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8207 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8208 [split setVertical:NO];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8209 }
668 7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	8210 else
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	8211 {
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	8212 [split setVertical:YES];
7b99731c6484 Fixes for splitbars (horizontal and vertical definitions are reversed). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 667 diff changeset	8213 }
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	8214 /* 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	8215 [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	8216 [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	8217 DW_FUNCTION_RETURN_THIS(split);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8218 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8219
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8220 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8221 * 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	8222 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8223 * 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	8224 * 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	8225 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8226 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	8227 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	8228 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	8229 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	8230 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8231 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8232 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	8233 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	8234 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	8235 /* 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	8236 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	8237 {
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	8238 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	8239 }
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	8240 else
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	8241 {
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 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	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 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	8245 {
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	8246 [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	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 else
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 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	8251 * 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	8252 * 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	8253 */
99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	8254 [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	8255 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8256 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8257 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8258
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8259 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8260 * 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	8261 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8262 * 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	8263 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8264 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	8265 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8266 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	8267 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	8268 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	8269 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	8270 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	8271 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	8272 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	8273 {
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	8274 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	8275 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	8276 }
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8277 else
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8278 {
677 99002595f549 Fixes for dw_splitbar_set() not working on an unsized window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 676 diff changeset	8279 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	8280 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	8281 }
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8282 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	8283 {
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	8284 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	8285 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8286 return retval;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8287 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8288
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	8289 /* Internal function to convert fontname to NSFont */
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	8290 NSFont _dw_font_by_name(char 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	8291 {
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	8292 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	8293 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	8294 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	8295
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	8296 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	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 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	8299 *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	8300 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	8301 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	8302 }
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 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	8304 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	8305 }
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
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8307 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8308 * 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	8309 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8310 * 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	8311 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8312 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	8313 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	8314 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	8315 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	8316 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8317 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8318 NSImageView *bitmap = [[NSImageView alloc] init];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8319 [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	8320 [bitmap setImageScaling:NSImageScaleNone];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8321 [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	8322 [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	8323 DW_FUNCTION_RETURN_THIS(bitmap);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8324 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8325
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8326 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8327 * Creates a pixmap with given parameters.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8328 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8329 * 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	8330 * 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	8331 * 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	8332 * depth: Color depth of the pixmap.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8333 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8334 * 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	8335 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8336 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	8337 {
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	8338 HPIXMAP pixmap;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8339
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	8340 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	8341 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	8342 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	8343 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	8344 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	8345 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	8346 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	8347 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	8348 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	8349 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	8350 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	8351 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	8352 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	8353 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	8354 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	8355 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	8356 return pixmap;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8357 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8358
957 beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8359 /* 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	8360 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	8361 {
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	8362 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	8363 [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	8364 [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	8365 [[[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	8366 /* 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	8367 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	8368
1590 9eef6f82ee50 Comment cleanup in the Mac source. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1586 diff changeset	8369 /* 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	8370 [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	8371
1590 9eef6f82ee50 Comment cleanup in the Mac source. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1586 diff changeset	8372 /* 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	8373 [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	8374
1590 9eef6f82ee50 Comment cleanup in the Mac source. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1586 diff changeset	8375 /* 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	8376 [t concat];
536ec60ee433 Don't destroy a pixmap if the handle is null mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 980 diff changeset	8377 [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	8378 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	8379 [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	8380 }
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8381
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8382 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8383 * Creates a pixmap from a file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8384 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8385 * 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	8386 * 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	8387 * DW pick the appropriate file extension.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8388 * (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	8389 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8390 * 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	8391 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8392 HPIXMAP API dw_pixmap_new_from_file(HWND handle, char *filename)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8393 {
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	8394 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	8395 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	8396 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	8397
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	8398 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	8399 {
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8400 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	8401 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	8402 }
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	8403 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	8404 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	8405 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	8406 {
cfcf66a90e8c Add support for different image file types in dw__from_file() functions. mhessling@81767d24-ef19-dc11-ae90-00e081727c95* parents: 937 diff changeset	8407 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	8408 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	8409 }
beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8410 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	8411 {
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8412 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	8413 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	8414 }
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 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	8416 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	8417 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	8418 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	8419 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	8420 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	8421 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	8422 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	8423 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	8424 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	8425 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	8426 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	8427 _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	8428 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	8429 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	8430 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	8431 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	8432 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	8433 return pixmap;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8434 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8435
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8436 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8437 * Creates a pixmap from memory.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8438 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8439 * 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	8440 * data: Source of the image data
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8441 * (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	8442 * le: length of data
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8443 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8444 * 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	8445 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8446 HPIXMAP API dw_pixmap_new_from_data(HWND handle, char *data, int len)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8447 {
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	8448 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	8449 DW_LOCAL_POOL_IN;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8450
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	8451 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	8452 {
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8453 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	8454 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	8455 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8456 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	8457 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	8458 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	8459 {
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8460 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	8461 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	8462 }
957 beed3e7f9d4b Fixes to flip pixmaps when loading from file or data on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 954 diff changeset	8463 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	8464 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	8465 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	8466 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	8467 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	8468 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	8469 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	8470 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	8471 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	8472 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	8473 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	8474 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	8475 _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	8476 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	8477 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	8478 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	8479 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	8480 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	8481 return pixmap;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8482 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8483
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8484 /*
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	8485 * 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	8486 * 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	8487 * 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	8488 * 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	8489 * 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	8490 * 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	8491 * is handled automatically
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8492 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8493 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	8494 {
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	8495 /* Don't do anything */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8496 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8497
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 * 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	8500 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8501 * 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	8502 * 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	8503 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8504 * 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	8505 */
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	8506 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	8507 {
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	8508 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	8509 DW_LOCAL_POOL_IN;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	8510
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	8511 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	8512 {
a51397ea24bf Added local auto-release macros on Mac to allow us to prevent leaks bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1574 diff changeset	8513 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	8514 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	8515 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8516
670 0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	8517 NSBundle *bundle = [NSBundle mainBundle];
0b920d0dc13e Implemented bitmap buttons and pixmaps from bundle resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 669 diff changeset	8518 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	8519 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	8520 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	8521
1318 ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8522 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	8523 {
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8524 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	8525 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	8526 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	8527 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	8528 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	8529 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	8530 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	8531 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	8532 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	8533 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	8534 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	8535 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	8536 _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	8537 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	8538 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	8539 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	8540 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	8541 [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	8542 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	8543 }
ebd67be26f43 Fixed some issues and deprecations building with Xcode 4.2 on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	8544 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	8545 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	8546 return NULL;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8547 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8548
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	8549 /*
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	8550 * 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	8551 * 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	8552 * 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	8553 * 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	8554 * 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	8555 * 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	8556 * 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	8557 * 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	8558 * 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	8559 */
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 int API dw_pixmap_set_font(HPIXMAP pixmap, char *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	8561 {
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 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	8563 {
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	8564 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	8565
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	8566 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	8567 {
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	8568 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	8569 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	8570 [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	8571 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	8572 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	8573 [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	8574 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	8575 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	8576 }
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 }
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 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	8579 }
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	8580
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8581 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8582 * Destroys an allocated pixmap.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8583 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8584 * 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	8585 * dw_pixmap_new..
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8586 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8587 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	8588 {
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	8589 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	8590 {
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	8591 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	8592 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	8593 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	8594 [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	8595 [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	8596 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	8597 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	8598 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8599 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8600
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8601 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8602 * Copies from one item to another.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8603 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8604 * dest: Destination window handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8605 * destp: Destination pixmap. (choose only one).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8606 * xdest: X coordinate of destination.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8607 * ydest: Y coordinate of destination.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8608 * width: Width of area to copy.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8609 * height: Height of area to copy.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8610 * src: Source window handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8611 * srcp: Source pixmap. (choose only one).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8612 * xsrc: X coordinate of source.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8613 * ysrc: Y coordinate of source.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8614 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8615 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	8616 {
1247 93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8617 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	8618 }
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8619
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8620 /*
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8621 * 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	8622 * Parameters:
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8623 * dest: Destination window handle.
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8624 * destp: Destination pixmap. (choose only one).
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8625 * xdest: X coordinate of destination.
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8626 * ydest: Y coordinate of destination.
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8627 * width: Width of the target area.
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8628 * height: Height of the target area.
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8629 * src: Source window handle.
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8630 * srcp: Source pixmap. (choose only one).
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8631 * xsrc: X coordinate of source.
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8632 * ysrc: Y coordinate of source.
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8633 * srcwidth: Width of area to copy.
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8634 * srcheight: Height of area to copy.
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8635 * Returns:
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8636 * 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	8637 */
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8638 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	8639 {
1886 f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	8640 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	8641 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	8642 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	8643
1247 93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8644 /* 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	8645 if((!dest && !destp) \|\| (!src && !srcp) \|\|
1247 93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8646 ((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	8647 {
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_OUT;
1247 93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8649 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	8650 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	8651
1886 f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	8652 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	8653 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	8654
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	8655 /* 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	8656 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	8657 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	8658 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	8659 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	8660 bltinfo->width = width;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8661 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	8662 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	8663 bltinfo->ysrc = ysrc;
1247 93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8664 bltinfo->srcwidth = srcwidth;
93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8665 bltinfo->srcheight = srcheight;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8666
699 b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	8667 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	8668 {
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	8669 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	8670 }
b79300831495 Offload some drawing functions to the main thread to prevent focus deadlocks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 698 diff changeset	8671 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	8672 {
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	8673 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	8674 [object retain];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8675 }
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	8676 [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	8677 DW_LOCAL_POOL_OUT;
1247 93607596cf85 Implemented dw_pixmap_stretch_bitblt() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1241 diff changeset	8678 return DW_ERROR_NONE;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8679 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8680
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8681 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8682 * 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	8683 * Not available under OS/2, eCS
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8684 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8685 * 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	8686 * 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	8687 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	8688 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	8689 {
729 6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	8690 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	8691 [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	8692 [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	8693 [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	8694 [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	8695 [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	8696 return calendar;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8697 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8698
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8699 /*
2012 75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8700 * 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	8701 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8702 * 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	8703 * year...
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 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	8706 {
729 6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	8707 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	8708 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	8709 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	8710 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	8711
1902 74f50459c530 Fix some deprecations introduced in Mac OS X Yosemite 10.10... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1896 diff changeset	8712 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	8713
1902 74f50459c530 Fix some deprecations introduced in Mac OS X Yosemite 10.10... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1896 diff changeset	8714 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	8715 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	8716
1902 74f50459c530 Fix some deprecations introduced in Mac OS X Yosemite 10.10... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1896 diff changeset	8717 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	8718 [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	8719 [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	8720 DW_LOCAL_POOL_OUT;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8721 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8722
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8723 /*
2012 75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8724 * 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	8725 * Parameters:
75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8726 * 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	8727 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8728 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	8729 {
729 6712e4211522 Switched to graphical calendar control style... and fixed date querying code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 728 diff changeset	8730 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	8731 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	8732 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	8733 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	8734 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	8735 *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	8736 *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	8737 *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	8738 [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	8739 DW_LOCAL_POOL_OUT;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8740 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8741
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8742 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8743 * 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	8744 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8745 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8746 * 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	8747 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8748 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	8749 {
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	8750 DWWebView *html = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8751 switch(action)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8752 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8753 case DW_HTML_GOBACK:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8754 [html goBack];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8755 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8756 case DW_HTML_GOFORWARD:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8757 [html goForward];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8758 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8759 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	8760 dw_html_url(handle, DW_HOME_URL);
752 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_SEARCH:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8763 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8764 case DW_HTML_RELOAD:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8765 [html reload:html];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8766 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8767 case DW_HTML_STOP:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8768 [html stopLoading:html];
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_PRINT:
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8771 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8772 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8773 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8774
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8775 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8776 * 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	8777 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8778 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8779 * 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	8780 * be rendered.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8781 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8782 * 0 on success.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8783 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8784 int API dw_html_raw(HWND handle, char *string)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8785 {
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	8786 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	8787 #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	8788 [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	8789 #else
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8790 [[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	8791 #endif
2014 b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	8792 return DW_ERROR_NONE;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8793 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8794
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8795 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8796 * 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	8797 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8798 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8799 * 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	8800 * file object to be rendered.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8801 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8802 * 0 on success.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8803 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8804 int API dw_html_url(HWND handle, char *url)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8805 {
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	8806 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	8807 #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	8808 [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	8809 #else
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8810 [[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	8811 #endif
2014 b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	8812 return DW_ERROR_NONE;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8813 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8814
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8815 /*
2012 75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8816 * 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	8817 * Parameters:
75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8818 * 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	8819 * 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	8820 * 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	8821 * 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	8822 * Returns:
75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8823 * 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	8824 */
75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8825 int dw_html_javascript_run(HWND handle, char script, void scriptdata)
75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8826 {
2014 b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	8827 DWWebView *html = handle;
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	8828 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	8829
2012 75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8830 #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	8831 [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	8832 {
59dfb86fb3b1 Mac: Implemented DW_SIGNAL_HTML_RESULT for all versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2014 diff changeset	8833 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	8834 _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	8835 }];
2014 b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	8836 #else
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	8837 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	8838 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	8839 _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	8840 #endif
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	8841 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	8842 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	8843 }
75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8844
75c6eb796e91 Mac: Implement dw_html_javascript_run() so things build again. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2004 diff changeset	8845 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8846 * 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	8847 * Not available under OS/2, eCS
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8848 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8849 * 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	8850 * 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	8851 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8852 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	8853 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	8854 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	8855 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	8856 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	8857 DW_FUNCTION_INIT;
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	8858 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	8859 #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	8860 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	8861 #else
b1838dd5509a Mac: Added support on MacOS versions that only support WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2013 diff changeset	8862 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	8863 #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	8864 /* [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	8865 DW_FUNCTION_RETURN_THIS(web);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8866 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8867
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8868 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8869 * 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	8870 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8871 * 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	8872 * 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	8873 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8874 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	8875 {
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8876 NSPoint mouseLoc;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8877 mouseLoc = [NSEvent mouseLocation];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8878 if(x)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8879 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8880 *x = mouseLoc.x;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8881 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8882 if(y)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8883 {
946 c64d3ca566f9 Attempt at inverting the window position and mouse pointer coordinates on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 945 diff changeset	8884 *y = [[NSScreen mainScreen] frame].size.height - mouseLoc.y;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8885 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8886 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8887
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8888 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8889 * 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	8890 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8891 * x: X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8892 * y: Y coordinate.
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 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	8895 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8896 /* 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	8897 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8898
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 * 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	8901 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8902 * 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	8903 * resource file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8904 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	8905 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	8906 {
1313 9f12bc79924b Autorelease fixes for Mac allowing the objects to dealloc when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1312 diff changeset	8907 NSMenu *menu = [[NSMenu alloc] init];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8908 [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	8909 /* [menu setTag:cid]; Why doesn't this work? */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8910 return menu;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8911 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8912
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8913 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8914 * Create a menubar on a window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8915 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8916 * 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	8917 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8918 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	8919 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8920 NSWindow *window = location;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8921 NSMenu *windowmenu = _generate_main_menu();
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8922 [[window contentView] setMenu:windowmenu];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8923 return (HMENUI)windowmenu;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8924 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8925
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8926 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8927 * 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	8928 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8929 * menu: Handle of a menu.
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 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	8932 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8933 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	8934 DW_LOCAL_POOL_IN;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8935 [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	8936 DW_LOCAL_POOL_OUT;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8937 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8938
1903 b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8939 /* 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	8940 * 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	8941 */
1904 2e456850e027 Minor fix for that last commit... code actually works now. ;) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1903 diff changeset	8942 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	8943 {
2e456850e027 Minor fix for that last commit... code actually works now. ;) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1903 diff changeset	8944 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	8945
1903 b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8946 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	8947 {
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8948 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	8949 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	8950 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	8951 }
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8952 else
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8953 {
1904 2e456850e027 Minor fix for that last commit... code actually works now. ;) bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1903 diff changeset	8954 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	8955
1903 b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8956 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	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 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	8959 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	8960 }
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8961 }
b94b4ad26a05 Minor fixes and changes to remove deprecation warnings in 10.10 and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1902 diff changeset	8962 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	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
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8965 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8966 * 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	8967 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8968 * 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	8969 * 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	8970 * x: X coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8971 * y: Y coordinate.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8972 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8973 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	8974 {
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	8975 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	8976 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	8977 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	8978 NSWindow *window = [view window];
701 c91a1b345f2e Fix for button press and context menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 700 diff changeset	8979 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	8980 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	8981 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	8982 [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	8983 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	8984 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	8985 location:_windowPointFromScreen(window, p)
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8986 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	8987 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	8988 windowNumber:[window windowNumber]
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8989 context:[NSGraphicsContext currentContext]
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8990 eventNumber:1
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8991 clickCount:1
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	8992 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	8993 [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	8994 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8995
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8996 char _removetilde(char dest, char src)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8997 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8998 int z, cur=0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	8999 char accel = '\0';
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9000
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9001 for(z=0;z<strlen(src);z++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9002 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9003 if(src[z] != '~')
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9004 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9005 dest[cur] = src[z];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9006 cur++;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9007 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9008 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9009 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9010 accel = src[z+1];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9011 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9012 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9013 dest[cur] = 0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9014 return accel;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9015 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9016
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9017 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9018 * 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	9019 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9020 * 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	9021 * 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	9022 * 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	9023 * 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	9024 * 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	9025 * 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	9026 * 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	9027 * 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	9028 */
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	9029 HWND API dw_menu_append_item(HMENUI menux, 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	9030 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9031 NSMenu *menu = menux;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9032 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	9033 DWMenuItem *item = NULL;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9034 if(strlen(title) == 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9035 {
1312 c5db6c70905c Added code to remove signal handlers when objects are destroyed on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1306 diff changeset	9036 [menu addItem:[DWMenuItem separatorItem]];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9037 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9038 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9039 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9040 char accel[2];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9041 char *newtitle = malloc(strlen(title)+1);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9042 NSString *nstr;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9043
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9044 accel[0] = _removetilde(newtitle, title);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9045 accel[1] = 0;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9046
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9047 nstr = [ NSString stringWithUTF8String:newtitle ];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9048 free(newtitle);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9049
1313 9f12bc79924b Autorelease fixes for Mac allowing the objects to dealloc when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1312 diff changeset	9050 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	9051 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	9052 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	9053 [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	9054
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9055 [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	9056 if(check)
6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	9057 {
6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	9058 [item setCheck:YES];
6506f29dfefc Implement automatic checking and unchecking of menu items on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1513 diff changeset	9059 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	9060 {
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	9061 [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	9062 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9063 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9064 if(flags & DW_MIS_DISABLED)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9065 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9066 [item setEnabled:NO];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9067 }
2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9068
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9069 if(submenux)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9070 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9071 [submenu setTitle:nstr];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9072 [menu setSubmenu:submenu forItem:item];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9073 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9074 return item;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9075 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9076 return item;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9077 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9078
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9079 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9080 * 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	9081 * 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	9082 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9083 * 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	9084 * id: Menuitem id.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9085 * 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	9086 */
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	9087 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	9088 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9089 id menu = menux;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9090 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	9091
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9092 if(menuitem != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9093 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9094 if(check)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9095 {
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	9096 [menuitem setState:DWControlStateValueOn];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9097 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9098 else
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9099 {
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	9100 [menuitem setState:DWControlStateValueOff];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9101 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9102 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9103 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9104
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9105 /*
1375 611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9106 * Deletes the menu item specified.
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9107 * Parameters:
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9108 * 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	9109 * 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	9110 * Returns:
1375 611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9111 * 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	9112 */
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9113 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	9114 {
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9115 id menu = menux;
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9116 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	9117
1375 611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9118 if(menuitem != nil)
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9119 {
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9120 [menu removeItem:menuitem];
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9121 return DW_ERROR_NONE;
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9122 }
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9123 return DW_ERROR_UNKNOWN;
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9124 }
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 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9127 * 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	9128 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9129 * 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	9130 * id: Menuitem id.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9131 * 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	9132 * DW_MIS_CHECKED/DW_MIS_UNCHECKED
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9133 */
654 80e253df49fd Implementing the menubar and hopefully popup menus. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 653 diff changeset	9134 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	9135 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9136 id menu = menux;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9137 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	9138
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9139 if(menuitem != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9140 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9141 if(state & DW_MIS_CHECKED)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9142 {
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	9143 [menuitem setState:DWControlStateValueOn];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9144 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9145 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	9146 {
1936 ebde5ef666a6 Fixes many deprecation warnings building for MacOS 10.14. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1935 diff changeset	9147 [menuitem setState:DWControlStateValueOff];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9148 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9149 if(state & DW_MIS_ENABLED)
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 [menuitem setEnabled:YES];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9152 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9153 else if(state & DW_MIS_DISABLED)
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 [menuitem setEnabled:NO];
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 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9158 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9159
652 ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	9160 /* 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	9161 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	9162 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9163 NSArray *pages = [notebook tabViewItems];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9164 for(DWNotebookPage *notepage in pages)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9165 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9166 if([notepage pageid] == pageid)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9167 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9168 return notepage;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9169 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9170 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9171 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	9172 }
ef0f484c6c4b Added even more... including first signal handling and notebooks among other controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 651 diff changeset	9173
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9174 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9175 * 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	9176 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9177 * 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	9178 * resource file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9179 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	9180 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	9181 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9182 DWNotebook *notebook = [[DWNotebook alloc] init];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9183 [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	9184 /* [notebook setTag:cid]; Why doesn't this work? */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9185 return notebook;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9186 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9187
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9188 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9189 * 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	9190 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9191 * handle: Window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9192 * flags: Any additional page creation flags.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9193 * 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	9194 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9195 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	9196 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9197 DWNotebook *notebook = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9198 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	9199 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	9200 [notepage setPageid:(int)page];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9201 if(front)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9202 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9203 [notebook insertTabViewItem:notepage atIndex:(NSInteger)0];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9204 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9205 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9206 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9207 [notebook addTabViewItem:notepage];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9208 }
1313 9f12bc79924b Autorelease fixes for Mac allowing the objects to dealloc when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1312 diff changeset	9209 [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	9210 [notebook setPageid:(int)(page+1)];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9211 return (unsigned long)page;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9212 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9213
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9214 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9215 * Remove a page from a notebook.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9216 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9217 * handle: Handle to the notebook widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9218 * 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	9219 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9220 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	9221 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9222 DWNotebook *notebook = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9223 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	9224 DW_LOCAL_POOL_IN;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9225
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9226 if(notepage != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9227 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9228 [notebook removeTabViewItem:notepage];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9229 }
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_OUT;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9231 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9232
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9233 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9234 * Queries the currently visible page ID.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9235 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9236 * handle: Handle to the notebook widget.
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 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	9239 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9240 DWNotebook *notebook = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9241 DWNotebookPage notepage = (DWNotebookPage )[notebook selectedTabViewItem];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9242 return [notepage pageid];
650 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
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9245 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9246 * Sets the currently visibale page ID.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9247 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9248 * handle: Handle to the notebook widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9249 * 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	9250 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9251 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	9252 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9253 DWNotebook *notebook = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9254 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	9255
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9256 if(notepage != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9257 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9258 [notebook selectTabViewItem:notepage];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9259 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9260 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9261
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9262 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9263 * 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	9264 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9265 * handle: Notebook handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9266 * 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	9267 * 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	9268 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9269 void API dw_notebook_page_set_text(HWND handle, ULONG pageid, char *text)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9270 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9271 DWNotebook *notebook = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9272 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	9273
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9274 if(notepage != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9275 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9276 [notepage setLabel:[ NSString stringWithUTF8String:text ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9277 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9278 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9279
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9280 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9281 * 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	9282 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9283 * handle: Notebook handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9284 * 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	9285 * 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	9286 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9287 void API dw_notebook_page_set_status_text(HWND handle, ULONG pageid, char *text)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9288 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9289 /* Note supported here... do nothing */
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9290 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9291
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9292 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9293 * 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	9294 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9295 * 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	9296 * 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	9297 * page: Box handle to be packed.
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 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	9300 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9301 DWNotebook *notebook = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9302 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	9303
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9304 if(notepage != nil)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9305 {
667 28727d9a835c Fix for a rather serious notebook layout bug. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 666 diff changeset	9306 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	9307 DWBox *box = tmpbox;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9308
667 28727d9a835c Fix for a rather serious notebook layout bug. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 666 diff changeset	9309 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	9310 [notepage setView:box];
1862 9c7485b1921c Fixed object/signal/memory leak on Mac when destroying bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	9311 [box autorelease];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9312 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9313 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9314
1610 48a61abcd5bb Make sure source will build with Mac frameworks older than 10.7. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1607 diff changeset	9315 #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	9316 #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	9317 #endif
48a61abcd5bb Make sure source will build with Mac frameworks older than 10.7. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1607 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 * Create a new Window Frame.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9321 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9322 * 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	9323 * title: The Window title.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9324 * 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	9325 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	9326 DW_FUNCTION_DEFINITION(dw_window_new, HWND, HWND hwndOwner, char *title, ULONG flStyle)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	9327 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	9328 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	9329 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	9330 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	9331 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	9332 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	9333 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	9334 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	9335 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	9336 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	9337 defer:false];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9338
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9339 [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	9340
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9341 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	9342
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9343 [window setContentView:view];
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9344 [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	9345 [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	9346 [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	9347 [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	9348 [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	9349
1607 d7fcea7bfcf9 Add full screen support for resizable windows on Mac 10.7. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1593 diff changeset	9350 /* 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	9351 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	9352 {
d7fcea7bfcf9 Add full screen support for resizable windows on Mac 10.7. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1593 diff changeset	9353 [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	9354 }
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9355
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	9356 /* 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	9357 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	9358 {
014b02436c1f Added MDI simulation code... the MDI "window" will just be a box for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 683 diff changeset	9359 id object = hwndOwner;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9360
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	9361 /* 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	9362 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	9363 {
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 /* 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	9365 [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	9366 [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	9367 }
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 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	9369 DW_FUNCTION_RETURN_THIS(window);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9370 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9371
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9372 /*
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	9373 * 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	9374 * Parameters:
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	9375 * handle: Window handle of the widget.
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	9376 * function: Function pointer to be called.
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	9377 * 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	9378 */
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	9379 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	9380 {
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	9381 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	9382 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	9383 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	9384 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	9385 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	9386 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	9387 [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	9388 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	9389 DW_LOCAL_POOL_OUT;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	9390 }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	9391
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	9392
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	9393 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9394 * 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	9395 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9396 * 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	9397 * 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	9398 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9399 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	9400 {
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	9401 id object = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9402
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9403 if([ object isKindOfClass:[ NSView class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9404 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9405 NSView *view = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 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 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	9408 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	9409 [view discardCursorRects];
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	9410 }
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	9411 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	9412 {
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	9413 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	9414 NSCursor *cursor = [NSCursor arrowCursor];
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9415
669 62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	9416 [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	9417 }
62aae18e7b7d Implemented most of the listbox functions for the actual listbox control... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 668 diff changeset	9418 /* 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	9419 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9420 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9421
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9422 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9423 * Makes the window visible.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9424 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9425 * 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	9426 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9427 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	9428 {
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	9429 NSObject *object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9430
1489 4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	9431 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	9432 {
4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	9433 DWWindow *window = handle;
4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	9434 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	9435 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	9436
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	9437 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	9438 {
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	9439 [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	9440 }
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	9441 /* 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	9442 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	9443 {
4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	9444 /* Determine the contents size */
4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	9445 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	9446 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9447 /* 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	9448 * 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	9449 */
1489 4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	9450 if(![window shown])
4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	9451 {
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9452 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	9453 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	9454 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	9455 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	9456
1489 4c1c44af201a Added auto-positioning and auto-sizing code for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1478 diff changeset	9457 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	9458
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9459 defaultx += 20;
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9460 defaulty += 20;
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9461 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	9462 defaultx = 20;
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9463 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	9464 defaulty = 20;
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9465
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	9466 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	9467 /* 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	9468 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	9469
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	9470 [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	9471 [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	9472 }
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	9473 [[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	9474 [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	9475
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	9476 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	9477 {
d056a50196a9 Attempted fix at Mac textured background repeat problems. Thanks to Christoph Sinai bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1779 diff changeset	9478 /* 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	9479 [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	9480 [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	9481 }
1795 9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9482 if(defaultitem)
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9483 {
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9484 /* 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	9485 [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	9486 }
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	9487 }
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	9488 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9489 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9490
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9491 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9492 * Makes the window invisible.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9493 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9494 * 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	9495 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9496 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	9497 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9498 NSObject *object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9499
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9500 if([ object isKindOfClass:[ NSWindow class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9501 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9502 NSWindow *window = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9503
733 8d5e5b89725f Fixed the crashing issue with dw_color_choose() it now functions properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 732 diff changeset	9504 [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	9505 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9506 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9507 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9508
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9509 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9510 * 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	9511 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9512 * handle: The window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9513 * 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	9514 * 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	9515 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9516 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	9517 {
739 a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	9518 id object = handle;
a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	9519 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	9520 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	9521 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	9522 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	9523
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	9524 /* 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	9525 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	9526 {
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 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	9528 }
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	9529 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	9530 {
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 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	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
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 /* 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	9535 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	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 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	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 /* 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	9540 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	9541 {
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 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	9543
1849 b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	9544 [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	9545 [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	9546 }
1849 b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	9547 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	9548 {
b5e1ccc76e58 Added code to set the foreground color on Mac buttons... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1848 diff changeset	9549 [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	9550 }
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	9551 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	9552 {
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	9553 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	9554
1848 68f923e57542 Attempt at resetting default colors with DW_CLR_DEFAULT on Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1843 diff changeset	9555 [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	9556 }
a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	9557 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	9558 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9559 DWBox *box = object;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 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 [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	9562 }
810 746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	9563 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	9564 {
746cdd753e7a Added coloring support for the Container/Tree/Listbox controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 809 diff changeset	9565 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	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 [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	9568 [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	9569 }
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	9570 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	9571 {
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	9572 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	9573 [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	9574 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	9575 [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	9576 }
739 a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	9577 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9578 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9579
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9580 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9581 * 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	9582 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9583 * handle: The window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9584 * 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	9585 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9586 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	9587 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9588 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9589 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9590
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 * 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	9593 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9594 * handle: Window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9595 * width: New width in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9596 * height: New height in pixels.
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 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	9599 {
1778 e71ab68198ce Minor cleanups for the Mac status text changes for 10.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1776 diff changeset	9600 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	9601
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	9602 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	9603 {
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	9604 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	9605 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	9606
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	9607 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	9608 {
1993 e643d280edae Mac: Fix compilation with the Catalina 10.15 SDK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1986 diff changeset	9609 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	9610 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	9611 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	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 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	9614 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	9615 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	9616
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	9617 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	9618 }
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	9619 }
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	9620 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	9621 {
bb3b2d804f0e Working on fonts some more.... setting a default label font that is smaller. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 739 diff changeset	9622 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	9623 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	9624
e71ab68198ce Minor cleanups for the Mac status text changes for 10.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1776 diff changeset	9625 [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	9626 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	9627 {
e71ab68198ce Minor cleanups for the Mac status text changes for 10.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1776 diff changeset	9628 [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	9629 }
1788 9d499b162fe1 Discovered a breakage in OS/2 functionality when building bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1786 diff changeset	9630 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	9631 {
9d499b162fe1 Discovered a breakage in OS/2 functionality when building bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1786 diff changeset	9632 [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	9633 }
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	9634 }
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	9635 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	9636 {
48f8efba898f Filled in most of the remaining MLE and container functions... the remaining few bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 674 diff changeset	9637 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	9638 [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	9639 }
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	9640 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	9641 {
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	9642 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	9643
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	9644 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	9645 {
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 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	9647 [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	9648 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	9649 [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	9650 }
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 }
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	9652 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	9653 {
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1313 diff changeset	9654 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	9655 {
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1313 diff changeset	9656 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	9657 [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	9658 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	9659 [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	9660 }
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 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	9662 {
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1313 diff changeset	9663 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	9664 [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	9665 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	9666 [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	9667 }
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 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9669 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9670
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9671 /*
1795 9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9672 * 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	9673 * Parameters:
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9674 * 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	9675 * Remarks:
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9676 * 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	9677 */
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9678 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	9679 {
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9680 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	9681
1795 9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9682 [[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	9683 }
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9684
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9685 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9686 * 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	9687 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9688 * window: Toplevel window or dialog.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9689 * 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	9690 * Remarks:
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1792 diff changeset	9691 * 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	9692 */
766 82cde14ec084 Enable recalculating the key view loop (keyboard focus list) automatically. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 763 diff changeset	9693 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	9694 {
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	9695 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	9696 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	9697
872 13debcad9757 Another test fix at reported crash in dw_window_default(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 867 diff changeset	9698 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	9699 {
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	9700 [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	9701 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9702 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9703
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9704 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9705 * 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	9706 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9707 * 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	9708 * 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	9709 */
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	9710 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	9711 {
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	9712 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	9713 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	9714
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	9715 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	9716 {
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	9717 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	9718 {
fc6a626a96cc Initial groupbox support. Sizing of the content frame is not quite right yet. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 768 diff changeset	9719 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	9720
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	9721 [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	9722 }
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	9723 }
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	9724 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	9725 {
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	9726 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	9727 {
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	9728 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	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 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	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 /* 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	9733 * 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	9734 */
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 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	9736 }
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 [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	9738 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9739 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9740
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9741 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9742 * 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	9743 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9744 * handle: Handle to receive mouse input.
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 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	9747 {
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	9748 /* 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	9749 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9750
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 * Releases previous mouse capture.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9753 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9754 void API dw_window_release(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9755 {
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	9756 /* 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	9757 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9758
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 * 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	9761 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9762 * handle: The window handle to destroy.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9763 * 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	9764 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9765 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	9766 {
686 218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9767 id object = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9768
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	9769 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	9770 {
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9771 /* 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	9772 * 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	9773 * 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	9774 */
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9775 NSWindow *window = handle;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9776
686 218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9777 /* 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	9778 if(newparent)
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9779 {
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9780 object = newparent;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9781
686 218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9782 /* 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	9783 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	9784 {
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9785 /* 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	9786 [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	9787 [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	9788 return;
218d676baf7f Implemented dw_window_reparent using the method used for MDI simulation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 685 diff changeset	9789 }
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 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	9792 [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	9793 [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	9794 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9795 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9796
1051 6919854298fd Added dw_font_choose() on Windows for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1050 diff changeset	9797 /* 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	9798 * Parameters:
6919854298fd Added dw_font_choose() on Windows for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1050 diff changeset	9799 * 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	9800 * Returns:
1051 6919854298fd Added dw_font_choose() on Windows for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1050 diff changeset	9801 * 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	9802 */
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9803 char * API dw_font_choose(char *currfont)
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9804 {
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9805 /* 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	9806 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	9807 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	9808 DWDialog *dialog;
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9809 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	9810
1050 48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9811 if(currfont)
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9812 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	9813
1050 48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9814 if(fontDlg)
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9815 {
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9816 dialog = [fontDlg dialog];
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9817 /* 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	9818 if(dialog)
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9819 {
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9820 return NULL;
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 }
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9823 else
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9824 {
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9825 [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	9826 fontManager = [NSFontManager sharedFontManager];
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9827 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	9828 }
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	9829
1050 48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9830 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	9831 if(font)
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9832 [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	9833 else
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9834 [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	9835 [fontDlg setDialog:dialog];
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9836 [fontDlg setFontManager:fontManager];
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9837 [fontManager orderFrontFontPanel:fontManager];
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9838
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	9839
1050 48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9840 /* 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	9841 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	9842 if(font)
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9843 {
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9844 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	9845 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	9846 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	9847 }
48f43c975533 Added dw_font_choose() on the Mac for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1048 diff changeset	9848 return NULL;
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
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9851 /* 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	9852 * 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	9853 */
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9854 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	9855 {
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9856 /* 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	9857 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	9858 {
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9859 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	9860
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9861 /* 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	9862 * 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	9863 */
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9864 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	9865 {
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9866 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	9867 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	9868 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9869
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9870 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	9871 {
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9872 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	9873 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	9874 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	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 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	9877 {
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9878 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	9879 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	9880 }
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9881 }
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9882 }
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9883 return NULL;
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9884 }
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9885
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9886 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9887 * 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	9888 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9889 * handle: The window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9890 * 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	9891 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9892 int API dw_window_set_font(HWND handle, char *fontname)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9893 {
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	9894 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	9895
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	9896 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	9897 {
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	9898 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	9899 if([object window])
673 6d0f0dc7ff7c Some minor font fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 672 diff changeset	9900 {
744 9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	9901 [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	9902 [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	9903 [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	9904 }
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	9905 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	9906 {
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	9907 [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	9908 }
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	9909 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	9910 {
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	9911 [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	9912 [[object cell] setFont:font];
673 6d0f0dc7ff7c Some minor font fixes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 672 diff changeset	9913 }
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	9914 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	9915 {
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	9916 DWRender *render = object;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	9917
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	9918 [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	9919 }
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9920 else
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9921 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	9922 /* 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	9923 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	9924
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9925 /* 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	9926 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	9927 {
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	9928 _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	9929 /* 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	9930 _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	9931 }
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9932 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	9933 }
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	9934 return DW_ERROR_UNKNOWN;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9935 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9936
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9937 /*
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9938 * Returns the current font for the specified window
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9939 * Parameters:
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9940 * 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	9941 */
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9942 char * API dw_window_get_font(HWND handle)
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9943 {
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	9944 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	9945 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	9946
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	9947 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	9948 {
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	9949 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	9950 }
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 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	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 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	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 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	9956 {
1041 6a57bf20d8f9 Return displayName property instead of fontName property in dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1040 diff changeset	9957 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	9958 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	9959 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	9960 }
a0aec9a56914 Font and color improvements... including implementing dw_window_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 738 diff changeset	9961 return NULL;
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9962 }
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9963
6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	9964 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9965 * 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	9966 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9967 * handle: The window handle to destroy.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9968 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	9969 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	9970 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	9971 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	9972 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	9973 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	9974 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	9975 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	9976 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	9977 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	9978
1375 611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9979 /* Handle destroying a top-level window */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9980 if([ object isKindOfClass:[ NSWindow class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9981 {
1313 9f12bc79924b Autorelease fixes for Mac allowing the objects to dealloc when destroyed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1312 diff changeset	9982 DWWindow *window = handle;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	9983 [window close];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 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 removing menu items from menus */
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9986 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	9987 {
611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9988 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	9989
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	9990 [menu removeItem:object];
1375 611893219ba9 Implemented dw_menu_delete_item() on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1340 diff changeset	9991 }
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	9992 /* 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	9993 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	9994 {
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	9995 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	9996
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	9997 /* 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	9998 * 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	9999 */
1549 ca6be9c48fff Implemented auto-sizing containers on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1543 diff changeset	10000 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	10001 && [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	10002 {
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	10003 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	10004 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	10005 }
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	10006
1099 d1cea9be1436 Fixed dw_window_destroy() with groupboxes on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1098 diff changeset	10007 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	10008 {
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	10009 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	10010 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	10011 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	10012 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	10013
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	10014 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	10015 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	10016
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	10017 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	10018 {
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	10019 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	10020 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	10021 }
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	10022
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10023 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	10024 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10025 [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	10026
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10027 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	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 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	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 /* 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	10032 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	10033 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10034 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	10035 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10036 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	10037 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10038 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	10039 }
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	10040 }
1955 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 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	10043 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	10044 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	10045 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	10046 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	10047 else
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->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	10049
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10050 /* 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	10051 _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	10052 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10053 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10054 }
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	10055 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	10056 DW_FUNCTION_RETURN_THIS(retval);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10057 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10058
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10059 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10060 * 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	10061 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10062 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10063 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10064 * 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	10065 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10066 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	10067 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	10068 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	10069 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	10070 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10071 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	10072 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	10073 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	10074
808 c0641a6d4258 Similar fix for dw_window_get_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 807 diff changeset	10075 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	10076 {
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	10077 id window = object;
808 c0641a6d4258 Similar fix for dw_window_get_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 807 diff changeset	10078 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	10079
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10080 retval = strdup([ nsstr UTF8String ]);
808 c0641a6d4258 Similar fix for dw_window_get_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 807 diff changeset	10081 }
c0641a6d4258 Similar fix for dw_window_get_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 807 diff changeset	10082 else if([ object isKindOfClass:[ NSControl class ] ])
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10083 {
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	10084 NSControl *control = object;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10085 NSString *nsstr = [ control stringValue];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10086
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10087 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	10088 }
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10089 DW_FUNCTION_RETURN_THIS(retval);
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10090 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10091
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10092 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10093 * 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	10094 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10095 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10096 * 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	10097 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10098 DW_FUNCTION_DEFINITION(dw_window_set_text, void, HWND handle, char *text)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10099 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	10100 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	10101 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	10102 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10103 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	10104 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	10105
807 f7016a38bedd Fix for dw_window_set_text() on buttons not working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 806 diff changeset	10106 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	10107 [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	10108 else if([ object isKindOfClass:[ NSControl class ] ])
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10109 {
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 NSControl *control = object;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10111 [control setStringValue:[ NSString stringWithUTF8String:text ]];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10112 }
953 2dfc06afc7d3 Support dw_window_set_text() for groupboxes mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 952 diff changeset	10113 else if([object isMemberOfClass:[DWGroupBox class]])
2dfc06afc7d3 Support dw_window_set_text() for groupboxes mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 952 diff changeset	10114 {
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	10115 DWGroupBox *groupbox = object;
953 2dfc06afc7d3 Support dw_window_set_text() for groupboxes mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 952 diff changeset	10116 [groupbox setTitle:[NSString stringWithUTF8String:text]];
2dfc06afc7d3 Support dw_window_set_text() for groupboxes mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 952 diff changeset	10117 }
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	10118 else
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	10119 return;
c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	10120 /* 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	10121 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	10122
1410 c607fd86e5c2 Initial code on the Mac to automatically calculate widget required sizes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1400 diff changeset	10123 /* 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	10124 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	10125 {
1792 b0bdec1b820c Similar fixes to the Mac one on OS/2 and Windows.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1791 diff changeset	10126 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	10127
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10128 _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	10129
1792 b0bdec1b820c Similar fixes to the Mac one on OS/2 and Windows.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1791 diff changeset	10130 /* 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	10131 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	10132 (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	10133 {
b0bdec1b820c Similar fixes to the Mac one on OS/2 and Windows.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1791 diff changeset	10134 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	10135 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	10136 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	10137 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	10138 /* 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	10139 _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	10140 }
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	10141 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10142 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10143 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10144
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10145 /*
1389 0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1385 diff changeset	10146 * 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	10147 * Parameters:
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1385 diff changeset	10148 * 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	10149 * 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	10150 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10151 DW_FUNCTION_DEFINITION(dw_window_set_tooltip, void, HWND handle, char *bubbletext)
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10152 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	10153 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	10154 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	10155 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10156 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	10157 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	10158 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	10159 [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	10160 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	10161 [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	10162 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	10163 }
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1385 diff changeset	10164
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1385 diff changeset	10165 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10166 * Disables given window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10167 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10168 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10169 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10170 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	10171 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	10172 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	10173 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	10174 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10175 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	10176 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	10177
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	10178 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	10179 {
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	10180 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	10181 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	10182 }
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	10183 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	10184 {
107e38a29eeb Allow dw_window_enable/disable() to work on menu items on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1275 diff changeset	10185 [object setEnabled:NO];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10186 }
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	10187 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	10188 {
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	10189 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	10190
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	10191 [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	10192 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10193 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10194 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10195
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10196 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10197 * Enables given window (widget).
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10198 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10199 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10200 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10201 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	10202 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	10203 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	10204 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	10205 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10206 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	10207 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	10208
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	10209 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	10210 {
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	10211 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	10212 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	10213 }
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	10214 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	10215 {
107e38a29eeb Allow dw_window_enable/disable() to work on menu items on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1275 diff changeset	10216 [object setEnabled:YES];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10217 }
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	10218 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	10219 {
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	10220 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	10221
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	10222 [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	10223 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10224 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10225 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10226
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10227 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10228 * 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	10229 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10230 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10231 * 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	10232 * (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	10233 * 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	10234 * 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	10235 * 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	10236 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	10237 void API dw_window_set_bitmap_from_data(HWND handle, unsigned long cid, char *data, int len)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10238 {
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	10239 id object = handle;
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	10240
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	10241 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	10242 {
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	10243 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	10244 {
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	10245 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	10246 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	10247 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	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(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	10250 {
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	10251 [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	10252 }
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 /* 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	10254 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	10255
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	10256 /* 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	10257 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	10258 {
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10259 _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	10260 /* 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	10261 _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	10262 }
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 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	10264 }
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	10265 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	10266 dw_window_set_bitmap(handle, cid, NULL);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10267 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10268 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10269
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10270 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10271 * 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	10272 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10273 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10274 * 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	10275 * (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	10276 * 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	10277 * 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	10278 * 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	10279 */
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	10280 void API dw_window_set_bitmap(HWND handle, unsigned long resid, char *filename)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10281 {
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	10282 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	10283 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	10284
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	10285 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	10286 {
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	10287 NSImage *bitmap = nil;
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	10288
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	10289 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	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 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	10292 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	10293
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	10294 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	10295
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	10296 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	10297 {
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 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	10299 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	10300 }
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	10301 }
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 && 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	10303 {
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	10304 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	10305 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10306
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	10307 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	10308 {
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	10309 [object setImage:bitmap];
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	10310
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	10311 /* 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	10312 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	10313
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	10314 /* 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	10315 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	10316 {
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 _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	10318 /* 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	10319 _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	10320 }
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	10321 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10322 }
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	10323 DW_LOCAL_POOL_OUT;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10324 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10325
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10326 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10327 * 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	10328 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10329 * handle: Handle to the window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10330 * 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	10331 */
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	10332 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	10333 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10334 /* 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	10335 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10336
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10337 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10338 * 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	10339 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10340 * handle: Handle to the parent window.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10341 * id: Integer ID of the child.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10342 */
685 314a12dccd20 Cleanups for conflicts with "id" which is a keyword in Objective-C. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 684 diff changeset	10343 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	10344 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10345 NSObject *object = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10346 NSView *view = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10347 if([ object isKindOfClass:[ NSWindow class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10348 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10349 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10350 view = [window contentView];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10351 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10352 return [view viewWithTag:cid];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10353 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10354
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10355 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10356 * 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	10357 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10358 * handle: The window handle to minimize.
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 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	10361 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10362 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10363 [window miniaturize:nil];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10364 return 0;
650 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
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10367 /* 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	10368 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10369 * 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	10370 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10371 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	10372 {
1101 d7eafaa054ab Added support for dw_window_redraw() causing splitbar panes to redraw without bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1100 diff changeset	10373 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	10374 [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	10375 [[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	10376 #ifndef BUILDING_FOR_MOJAVE
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10377 [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	10378 #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	10379 [window setRedraw:NO];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10380 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10381
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10382 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10383 * Makes the window topmost.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10384 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10385 * 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	10386 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10387 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	10388 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10389 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10390 [window orderFront:nil];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10391 return 0;
650 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
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10394 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10395 * Makes the window bottommost.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10396 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10397 * 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	10398 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10399 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	10400 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10401 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10402 [window orderBack:nil];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10403 return 0;
650 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
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10406 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10407 * 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	10408 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10409 * handle: Window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10410 * width: New width in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10411 * height: New height in pixels.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10412 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10413 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	10414 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	10415 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	10416 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	10417 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10418 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10419 NSObject *object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10420
1494 cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10421 if([ object isMemberOfClass:[ DWWindow class ] ])
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10422 {
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10423 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	10424 Box *thisbox;
1478 7216f4301364 Fix mixing frame and content sizes on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1474 diff changeset	10425 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	10426
1478 7216f4301364 Fix mixing frame and content sizes on the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1474 diff changeset	10427 /* 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	10428 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	10429
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 /*
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	10431 * 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	10432 * 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	10433 */
1906 fac81560eb09 Fix a number of warning generated by the new bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1905 diff changeset	10434 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	10435 {
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 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	10437
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	10438 /* Calculate space requirements */
1446 0d4fdf646caf Fix clang integer conversion warning on 64bit Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1442 diff changeset	10439 _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	10440
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	10441 /* 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	10442 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	10443 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	10444 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	10445
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	10446 /* 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	10447 [window setContentSize:content.size];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10448 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10449 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10450 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10451
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10452 /*
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	10453 * 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	10454 * 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	10455 * 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	10456 * 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	10457 * 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	10458 */
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 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	10460 {
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	10461 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	10462
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	10463 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	10464 {
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	10465 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	10466
1906 fac81560eb09 Fix a number of warning generated by the new bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1905 diff changeset	10467 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	10468 {
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 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	10470 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	10471
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	10472 /* 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	10473 _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	10474
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	10475 /* 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	10476 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	10477
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	10478 /* 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	10479 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	10480 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	10481 }
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 }
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	10483 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	10484 {
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 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	10486
1906 fac81560eb09 Fix a number of warning generated by the new bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1905 diff changeset	10487 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	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 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	10490
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	10491 /* 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	10492 _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	10493
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	10494 /* 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	10495 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	10496 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	10497 }
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 }
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	10499 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	10500 _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	10501 }
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	10502
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	10503 /*
1474 cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10504 * 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	10505 * 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	10506 * Parameters:
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10507 * handle: Window (widget) handle.
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10508 * 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	10509 * 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	10510 */
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10511 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	10512 {
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10513 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	10514 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	10515 }
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 /* 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	10518 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	10519 {
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10520 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	10521 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	10522 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	10523
1474 cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10524 /* Do any gravity calculations */
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10525 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	10526 {
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10527 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	10528
1474 cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10529 /* Handle horizontal center gravity */
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10530 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	10531 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	10532 /* Handle right gravity */
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10533 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	10534 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	10535 /* Handle vertical center gravity */
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10536 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	10537 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	10538 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	10539 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	10540
1474 cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10541 /* Save the new values */
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10542 *x = newx;
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10543 *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	10544 }
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	10545 /* 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	10546 if((horz \| vert) & DW_GRAV_OBSTACLES)
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10547 {
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	10548 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	10549 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	10550
1494 cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10551 if(horz & DW_GRAV_OBSTACLES)
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10552 {
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10553 if((horz & 0xf) == DW_GRAV_LEFT)
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10554 *x += visiblerect.origin.x;
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10555 else if((horz & 0xf) == DW_GRAV_RIGHT)
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10556 *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	10557 }
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10558 if(vert & DW_GRAV_OBSTACLES)
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10559 {
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10560 if((vert & 0xf) == DW_GRAV_BOTTOM)
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10561 *y += visiblerect.origin.y;
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10562 else if((vert & 0xf) == DW_GRAV_TOP)
cf960e266444 Fixes for gravity obstacles on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1492 diff changeset	10563 *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	10564 }
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	10565 }
1474 cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10566 }
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10567
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10568 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10569 * 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	10570 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10571 * handle: Window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10572 * 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	10573 * 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	10574 */
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10575 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	10576 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	10577 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	10578 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	10579 {
91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10580 DW_FUNCTION_INIT;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10581 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	10582
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	10583 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	10584 {
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	10585 DWWindow *window = handle;
1474 cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10586 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	10587 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	10588
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	10589 /* 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	10590 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	10591 {
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	10592 /* 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	10593 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	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
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 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	10597 _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	10598
1474 cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10599 point.x = x;
cd3d7e341467 Initial implementation of dw_window_set_gravity() on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1457 diff changeset	10600 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	10601
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10602 [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	10603 /* 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	10604 [window setShown:YES];
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10605 }
1955 91541efcea10 Mac: Complete refactoring of the Mac code using a handful of macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1954 diff changeset	10606 DW_FUNCTION_RETURN_NOTHING;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10607 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10608
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10609 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10610 * 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	10611 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10612 * handle: Window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10613 * 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	10614 * 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	10615 * width: Width of the widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10616 * height: Height of the widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10617 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10618 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	10619 {
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	10620 dw_window_set_size(handle, width, height);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10621 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	10622 }
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 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10625 * 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	10626 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10627 * handle: Window (widget) handle.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10628 * 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	10629 * 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	10630 * width: Width of the widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10631 * height: Height of the widget.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10632 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10633 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	10634 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10635 NSObject *object = handle;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10636
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10637 if([ object isKindOfClass:[ NSWindow class ] ])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10638 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10639 NSWindow *window = handle;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10640 NSRect rect = [window frame];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10641 if(x)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10642 *x = rect.origin.x;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10643 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	10644 *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	10645 if(width)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10646 *width = rect.size.width;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10647 if(height)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10648 *height = rect.size.height;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10649 return;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10650 }
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	10651 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	10652 {
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	10653 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	10654 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	10655 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	10656 *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	10657 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	10658 *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	10659 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	10660 *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	10661 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	10662 *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	10663 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	10664 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10665 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10666
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10667 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10668 * Returns the width of the screen.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10669 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10670 int API dw_screen_width(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10671 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10672 NSRect screenRect = [[NSScreen mainScreen] frame];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10673 return screenRect.size.width;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10674 }
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 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10677 * Returns the height of the screen.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10678 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10679 int API dw_screen_height(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10680 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10681 NSRect screenRect = [[NSScreen mainScreen] frame];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10682 return screenRect.size.height;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10683 }
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 /* 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	10686 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	10687 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10688 NSWindowDepth screenDepth = [[NSScreen mainScreen] depth];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10689 return NSBitsPerPixelFromDepth(screenDepth);
650 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
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10692 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10693 * 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	10694 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10695 * env: Pointer to a DWEnv struct.
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 void dw_environment_query(DWEnv *env)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10698 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10699 struct utsname name;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10700
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10701 uname(&name);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10702 strcpy(env->osName, "MacOS");
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10703
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10704 strcpy(env->buildDate, __DATE__);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10705 strcpy(env->buildTime, __TIME__);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10706 env->DWMajorVersion = DW_MAJOR_VERSION;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10707 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	10708 #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	10709 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	10710 #else
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10711 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	10712 #endif
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10713
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	10714 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	10715 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	10716 env->MajorBuild = DWOSBuild;
809 1ef0f4c03c14 MinorBuild was being left uninitialized. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 808 diff changeset	10717 env->MinorBuild = 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10718 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10719
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10720 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10721 * Emits a beep.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10722 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10723 * freq: Frequency.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10724 * dur: Duration.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10725 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10726 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	10727 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10728 NSBeep();
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10729 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10730
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10731 /* 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	10732 * anything you have drawn is visible.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10733 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10734 void API dw_flush(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10735 {
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	10736 /* 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	10737 [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	10738 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10739
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10740 /* 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	10741 * 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	10742 * dw_window_get_data().
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10743 */
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10744 UserData _find_userdata(UserData root, char varname)
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10745 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10746 UserData tmp = root;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10747
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10748 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10749 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10750 if(strcasecmp(tmp->varname, varname) == 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10751 return tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10752 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10753 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10754 return NULL;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10755 }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10756
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10757 int _new_userdata(UserData *root, char varname, void *data)
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10758 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10759 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	10760
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10761 if(new)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10762 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10763 new->data = data;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10764 return TRUE;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10765 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10766 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10767 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10768 new = malloc(sizeof(UserData));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10769 if(new)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10770 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10771 new->varname = strdup(varname);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10772 new->data = data;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10773
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10774 new->next = NULL;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10775
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10776 if (!*root)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10777 *root = new;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10778 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10779 {
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	10780 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	10781
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10782 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10783 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10784 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10785 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10786 }
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	10787 prev->next = new;
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10788 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10789 return TRUE;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10790 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10791 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10792 return FALSE;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10793 }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10794
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10795 int _remove_userdata(UserData *root, char varname, int all)
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10796 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10797 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	10798
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10799 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10800 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10801 if(all \|\| strcasecmp(tmp->varname, varname) == 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10802 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10803 if(!prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10804 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10805 *root = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10806 free(tmp->varname);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10807 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10808 if(!all)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10809 return 0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10810 tmp = *root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10811 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10812 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10813 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10814 /* If all is true we should
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10815 * never get here.
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10816 */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10817 prev->next = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10818 free(tmp->varname);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10819 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10820 return 0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10821 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10822 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10823 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10824 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10825 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10826 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10827 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10828 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10829 return 0;
651 270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10830 }
270580896dac Filling in more class types. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 650 diff changeset	10831
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10832 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10833 * 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	10834 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10835 * 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	10836 * 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	10837 * 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	10838 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10839 void dw_window_set_data(HWND window, char dataname, void data)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10840 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10841 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	10842 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	10843 {
5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	10844 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	10845 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	10846 }
5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	10847 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	10848 {
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	10849 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	10850 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	10851 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10852 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	10853
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10854 if(!blah)
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(!dataname)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10857 return;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10858
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10859 blah = calloc(1, sizeof(WindowData));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10860 [object setUserdata:blah];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10861 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10862
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10863 if(data)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10864 _new_userdata(&(blah->root), dataname, data);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10865 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10866 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10867 if(dataname)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10868 _remove_userdata(&(blah->root), dataname, FALSE);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10869 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10870 _remove_userdata(&(blah->root), NULL, TRUE);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10871 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10872 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10873
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10874 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10875 * 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	10876 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10877 * 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	10878 * 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	10879 * 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	10880 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10881 void dw_window_get_data(HWND window, char dataname)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10882 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10883 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	10884 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	10885 {
5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	10886 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	10887 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	10888 }
5fe12469c1fb Fix for dw_window_set/get_data() on a top-level window. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 680 diff changeset	10889 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	10890 {
9861d264925d MLE was missing the scrollbar. Fixes for getting and setting the position. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 675 diff changeset	10891 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	10892 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	10893 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10894 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	10895
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10896 if(blah && blah->root && dataname)
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 UserData *ud = _find_userdata(&(blah->root), dataname);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10899 if(ud)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10900 return ud->data;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10901 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10902 return NULL;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10903 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10904
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	10905 #define DW_TIMER_MAX 64
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	10906 NSTimer *DWTimers[DW_TIMER_MAX];
f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	10907
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10908 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10909 * 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	10910 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10911 * interval: Milliseconds to delay between calls.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10912 * 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	10913 * 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	10914 * Returns:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10915 * 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	10916 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10917 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	10918 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10919 int z;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10920
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10921 for(z=0;z<DW_TIMER_MAX;z++)
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 if(!DWTimers[z])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10924 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10925 break;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10926 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10927 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10928
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10929 if(sigfunc && !DWTimers[z])
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 NSTimeInterval seconds = (double)interval / 1000.0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10932 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	10933 _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	10934 return z+1;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10935 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10936 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10937 }
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 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10940 * Removes timer callback.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10941 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10942 * 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	10943 */
657 f31a47b055f8 Work (unfinished) on container objects. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 656 diff changeset	10944 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	10945 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10946 SignalHandler prev = NULL, tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10947 NSTimer *thistimer;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10948
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10949 /* 0 is an invalid timer ID */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10950 if(timerid < 1 \|\| !DWTimers[timerid-1])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10951 return;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10952
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10953 thistimer = DWTimers[timerid-1];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10954 DWTimers[timerid-1] = nil;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10955
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10956 [thistimer invalidate];
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	10957
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10958 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10959 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10960 if(tmp->id == timerid && tmp->window == thistimer)
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(prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10963 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10964 prev->next = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10965 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10966 tmp = prev->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10967 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10968 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10969 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10970 Root = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10971 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10972 tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10973 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10974 }
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 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10977 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10978 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10979 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	10980 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10981 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10982
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10983 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10984 * 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	10985 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10986 * 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	10987 * 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	10988 * 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	10989 * 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	10990 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10991 void API dw_signal_connect(HWND window, char signame, void sigfunc, void *data)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10992 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	10993 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	10994 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	10995
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	10996 /*
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	10997 * 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	10998 * Parameters:
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	10999 * 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	11000 * 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	11001 * 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	11002 * 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	11003 * 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	11004 */
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11005 void API dw_signal_connect_data(HWND window, char signame, void sigfunc, void discfunc, void data)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11006 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11007 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	11008
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	11009 /* 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	11010 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	11011 {
2fe7fca61236 Added support for trapping the Mac Quit handler by using DW_DESKTOP as bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1825 diff changeset	11012 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	11013 }
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11014
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11015 if(window && signame && sigfunc)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11016 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11017 if((message = _findsigmessage(signame)) != 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11018 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11019 _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	11020 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11021 }
650 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
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11024 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11025 * 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	11026 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11027 * 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	11028 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11029 void API dw_signal_disconnect_by_name(HWND window, char *signame)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11030 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11031 SignalHandler prev = NULL, tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11032 ULONG message;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	11033
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11034 if(!window \|\| !signame \|\| (message = _findsigmessage(signame)) == 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11035 return;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	11036
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11037 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11038 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11039 if(tmp->window == window && tmp->message == message)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11040 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11041 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	11042
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11043 if(discfunc)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11044 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11045 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	11046 }
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	11047
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11048 if(prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11049 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11050 prev->next = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11051 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11052 tmp = prev->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11053 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11054 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11055 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11056 Root = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11057 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11058 tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11059 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11060 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11061 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11062 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11063 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11064 tmp = tmp->next;
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 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11067 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11068
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11069 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11070 * 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	11071 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11072 * 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	11073 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11074 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	11075 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11076 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	11077
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11078 while(tmp)
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 if(tmp->window == window)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11081 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11082 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	11083
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11084 if(discfunc)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11085 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11086 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	11087 }
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	11088
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11089 if(prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11090 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11091 prev->next = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11092 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11093 tmp = prev->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11094 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11095 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11096 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11097 Root = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11098 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11099 tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11100 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11101 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11102 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11103 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11104 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11105 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11106 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11107 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11108 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11109
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11110 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11111 * 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	11112 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11113 * 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	11114 * 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	11115 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11116 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	11117 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11118 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	11119
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11120 while(tmp)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11121 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11122 if(tmp->window == window && tmp->data == data)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11123 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11124 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	11125
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11126 if(discfunc)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11127 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1849 diff changeset	11128 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	11129 }
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	11130
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11131 if(prev)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11132 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11133 prev->next = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11134 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11135 tmp = prev->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11136 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11137 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11138 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11139 Root = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11140 free(tmp);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11141 tmp = Root;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11142 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11143 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11144 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11145 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11146 prev = tmp;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11147 tmp = tmp->next;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11148 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11149 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11150 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11151
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11152 void _my_strlwr(char *buf)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11153 {
1110 404b639f096b Minor typecast fixes for warnings reported by clang on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1102 diff changeset	11154 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	11155
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11156 for(z=0;z<len;z++)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11157 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11158 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	11159 buf[z] -= 'A' - 'a';
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11160 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11161 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11162
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11163 /* 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	11164 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11165 * 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	11166 * handle: Pointer to a module handle,
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11167 * 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	11168 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11169 int dw_module_load(char name, HMOD handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11170 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11171 int len;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11172 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	11173 char errorbuf[1025];
650 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 if(!handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11177 return -1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11178
1110 404b639f096b Minor typecast fixes for warnings reported by clang on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1102 diff changeset	11179 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	11180 return -1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11181
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11182 /* Lenth + "lib" + ".dylib" + NULL */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11183 newname = malloc(len + 10);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11184
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11185 if(!newname)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11186 return -1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11187
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11188 sprintf(newname, "lib%s.dylib", name);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11189 _my_strlwr(newname);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11190
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11191 *handle = dlopen(newname, RTLD_NOW);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11192 if(*handle == NULL)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11193 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11194 strncpy(errorbuf, dlerror(), 1024);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11195 printf("%s\n", errorbuf);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11196 sprintf(newname, "lib%s.dylib", name);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11197 *handle = dlopen(newname, RTLD_NOW);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11198 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11199
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11200 free(newname);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11201
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11202 return (NULL == *handle) ? -1 : 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11203 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11204
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11205 /* 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	11206 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11207 * 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	11208 * 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	11209 * 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	11210 * the address.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11211 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11212 int dw_module_symbol(HMOD handle, char name, void*func)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11213 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11214 if(!func \|\| !name)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11215 return -1;
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 if(strlen(name) == 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11218 return -1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11219
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11220 func = (void)dlsym(handle, name);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11221 return (NULL == *func);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11222 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11223
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11224 /* Frees the shared library previously opened.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11225 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11226 * 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	11227 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11228 int dw_module_close(HMOD handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11229 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11230 if(handle)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11231 return dlclose(handle);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11232 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11233 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11234
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11235 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11236 * 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	11237 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11238 HMTX dw_mutex_new(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11239 {
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	11240 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	11241
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	11242 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	11243 return mutex;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11244 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11245
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11246 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11247 * 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	11248 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11249 * 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	11250 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11251 void dw_mutex_close(HMTX mutex)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11252 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11253 if(mutex)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11254 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11255 pthread_mutex_destroy(mutex);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11256 free(mutex);
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 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11259
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11260 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11261 * 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	11262 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11263 * 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	11264 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11265 void dw_mutex_lock(HMTX mutex)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11266 {
693 2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	11267 /* 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	11268 * 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	11269 * 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	11270 * 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	11271 */
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	11272 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	11273 {
693 2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	11274 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	11275 {
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	11276 /* 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	11277 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	11278 {
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	11279 /* 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	11280 }
693 2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	11281 }
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	11282 }
693 2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	11283 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	11284 {
693 2f21ee9d7c7b Experimental change for locking on the main thread... will be committing bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 692 diff changeset	11285 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	11286 }
650 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
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11289 /*
1158 f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	11290 * 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	11291 * Parameters:
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	11292 * 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	11293 * Returns:
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	11294 * 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	11295 */
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	11296 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	11297 {
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	11298 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	11299 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	11300 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	11301 }
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	11302
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	11303 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11304 * Reliquishes the access to the semaphore.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11305 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11306 * 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	11307 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11308 void dw_mutex_unlock(HMTX mutex)
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 pthread_mutex_unlock(mutex);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11311 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11312
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11313 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11314 * 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	11315 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11316 HEV dw_event_new(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11317 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11318 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	11319
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11320 if(!eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11321 return NULL;
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 /* 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	11324 * 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	11325 * 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	11326 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11327 pthread_mutex_init (&(eve->mutex), NULL);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11328 pthread_mutex_lock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11329 pthread_cond_init (&(eve->event), NULL);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11330
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11331 pthread_mutex_unlock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11332 eve->alive = 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11333 eve->posted = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11334
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11335 return eve;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11336 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11337
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11338 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11339 * 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	11340 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11341 * 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	11342 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11343 int dw_event_reset (HEV eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11344 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11345 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	11346 return DW_ERROR_NON_INIT;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11347
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11348 pthread_mutex_lock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11349 pthread_cond_broadcast (&(eve->event));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11350 pthread_cond_init (&(eve->event), NULL);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11351 eve->posted = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11352 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	11353 return DW_ERROR_NONE;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11354 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11355
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 * 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	11358 * 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	11359 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11360 * 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	11361 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11362 int dw_event_post (HEV eve)
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 if(!eve)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11365 return FALSE;
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 pthread_mutex_lock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11368 pthread_cond_broadcast (&(eve->event));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11369 eve->posted = 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11370 pthread_mutex_unlock (&(eve->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11371 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11372 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11373
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11374 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11375 * 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	11376 * 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	11377 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11378 * 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	11379 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11380 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	11381 {
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	11382 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	11383
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	11384 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	11385 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	11386
1202 5c1a01c6384d Think we need to check the posted state inside the mutex... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1201 diff changeset	11387 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	11388
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	11389 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	11390 {
5c1a01c6384d Think we need to check the posted state inside the mutex... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1201 diff changeset	11391 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	11392 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	11393 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	11394
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	11395 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	11396 {
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	11397 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	11398 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	11399
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	11400 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	11401 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	11402 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	11403 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	11404 }
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	11405 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	11406 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	11407 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	11408 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	11409 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	11410 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	11411 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	11412 return DW_ERROR_GENERAL;
650 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
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 * 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	11417 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11418 * 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	11419 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11420 int dw_event_close(HEV *eve)
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 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	11423 return DW_ERROR_NON_INIT;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11424
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11425 pthread_mutex_lock (&((*eve)->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11426 pthread_cond_destroy (&((*eve)->event));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11427 pthread_mutex_unlock (&((*eve)->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11428 pthread_mutex_destroy (&((*eve)->mutex));
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11429 free(*eve);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11430 *eve = NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11431
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	11432 return DW_ERROR_NONE;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11433 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11434
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11435 struct _seminfo {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11436 int fd;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11437 int waiting;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11438 };
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11439
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11440 static void _handle_sem(int *tmpsock)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11441 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11442 fd_set rd;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11443 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	11444 int listenfd = tmpsock[0];
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11445 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	11446 char command;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11447 sigset_t mask;
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 sigfillset(&mask); /* Mask all allowed signals */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11450 pthread_sigmask(SIG_BLOCK, &mask, NULL);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11451
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11452 /* problems */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11453 if(tmpsock[1] == -1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11454 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11455 free(array);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11456 return;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11457 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11458
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11459 array[0].fd = tmpsock[1];
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11460 array[0].waiting = 0;
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 /* 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	11463 free(tmpsock);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11464
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11465 while(1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11466 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11467 FD_ZERO(&rd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11468 FD_SET(listenfd, &rd);
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 maxfd = listenfd;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11471
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11472 /* 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	11473 for(z=0;z<connectcount;z++)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11474 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11475 if(array[z].fd > maxfd)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11476 maxfd = array[z].fd;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11477
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11478 FD_SET(array[z].fd, &rd);
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 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	11482 {
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	11483 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	11484 return;
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1885 diff changeset	11485 }
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11486
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11487 if(FD_ISSET(listenfd, &rd))
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11488 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11489 struct _seminfo *newarray;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11490 int newfd = accept(listenfd, 0, 0);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11491
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11492 if(newfd > -1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11493 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11494 /* Add new connections to the set */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11495 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	11496 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	11497
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11498 newarray[connectcount].fd = newfd;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11499 newarray[connectcount].waiting = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11500
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11501 connectcount++;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11502
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11503 /* Replace old array with new one */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11504 free(array);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11505 array = newarray;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11506 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11507 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11508
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11509 /* 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	11510 for(z=0;z<connectcount;z++)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11511 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11512 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	11513 {
1110 404b639f096b Minor typecast fixes for warnings reported by clang on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1102 diff changeset	11514 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	11515 {
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	11516 struct _seminfo *newarray = NULL;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11517
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11518 /* 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	11519 if(connectcount > 1)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11520 {
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	11521 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	11522 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	11523 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	11524 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	11525 {
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	11526 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	11527 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	11528 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	11529 }
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 connectcount--;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11532
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11533 /* Replace old array with new one */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11534 free(array);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11535 array = newarray;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11536 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11537 else if(bytesread == 1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11538 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11539 switch(command)
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 case 0:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11542 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11543 /* Reset */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11544 posted = 0;
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 break;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11547 case 1:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11548 /* Post */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11549 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11550 int s;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11551 char tmp = (char)0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11552
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11553 posted = 1;
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 for(s=0;s<connectcount;s++)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11556 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11557 /* The semaphore has been posted so
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11558 * 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	11559 * continue.
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 if(array[s].waiting)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11562 write(array[s].fd, &tmp, 1);
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 break;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11566 case 2:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11567 /* Wait */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11568 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11569 char tmp = (char)0;
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 array[z].waiting = 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 /* If we are posted exit immeditately */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11574 if(posted)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11575 write(array[z].fd, &tmp, 1);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11576 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11577 break;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11578 case 3:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11579 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11580 /* Done Waiting */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11581 array[z].waiting = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11582 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11583 break;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11584 }
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 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11588 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11589 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11590
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11591 /* 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	11592 /* 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	11593 * opened from other processes.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11594 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11595 * 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	11596 * 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	11597 * by other processes.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11598 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11599 HEV dw_named_event_new(char *name)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11600 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11601 struct sockaddr_un un;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11602 int ev, tmpsock = (int )malloc(sizeof(int)*2);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11603 HEV eve;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11604 DWTID dwthread;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11605
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11606 if(!tmpsock)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11607 return NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11608
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11609 eve = (HEV)malloc(sizeof(struct _dw_unix_event));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11610
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11611 if(!eve)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11612 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11613 free(tmpsock);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11614 return NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11615 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	11616
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11617 tmpsock[0] = socket(AF_UNIX, SOCK_STREAM, 0);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11618 ev = socket(AF_UNIX, SOCK_STREAM, 0);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11619 memset(&un, 0, sizeof(un));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11620 un.sun_family=AF_UNIX;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11621 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11622 strcpy(un.sun_path, "/tmp/.dw/");
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11623 strcat(un.sun_path, name);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11624
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11625 /* just to be safe, this should be changed
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11626 * to support multiple instances.
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11627 */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11628 remove(un.sun_path);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11629
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11630 bind(tmpsock[0], (struct sockaddr *)&un, sizeof(un));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11631 listen(tmpsock[0], 0);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11632 connect(ev, (struct sockaddr *)&un, sizeof(un));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11633 tmpsock[1] = accept(tmpsock[0], 0, 0);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11634
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11635 if(tmpsock[0] < 0 \|\| tmpsock[1] < 0 \|\| ev < 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11636 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11637 if(tmpsock[0] > -1)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11638 close(tmpsock[0]);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11639 if(tmpsock[1] > -1)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11640 close(tmpsock[1]);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11641 if(ev > -1)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11642 close(ev);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11643 free(tmpsock);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11644 free(eve);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11645 return NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11646 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11647
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11648 /* Create a thread to handle this event semaphore */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11649 pthread_create(&dwthread, NULL, (void )_handle_sem, (void )tmpsock);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11650 eve->alive = ev;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11651 return eve;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11652 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11653
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11654 /* 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	11655 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11656 * 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	11657 * 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	11658 * by other processes.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11659 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11660 HEV dw_named_event_get(char *name)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11661 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11662 struct sockaddr_un un;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11663 HEV eve;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11664 int ev = socket(AF_UNIX, SOCK_STREAM, 0);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11665 if(ev < 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11666 return NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11667
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11668 eve = (HEV)malloc(sizeof(struct _dw_unix_event));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11669
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11670 if(!eve)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11671 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11672 close(ev);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11673 return NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11674 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11675
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11676 un.sun_family=AF_UNIX;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11677 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11678 strcpy(un.sun_path, "/tmp/.dw/");
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11679 strcat(un.sun_path, name);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11680 connect(ev, (struct sockaddr *)&un, sizeof(un));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11681 eve->alive = ev;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11682 return eve;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11683 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11684
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11685 /* 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	11686 * on this semaphore will block.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11687 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11688 * 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	11689 * an open or create call.
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 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	11692 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11693 /* signal reset */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11694 char tmp = (char)0;
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 if(!eve \|\| eve->alive < 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11697 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11698
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11699 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	11700 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11701 return 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11702 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11703
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11704 /* 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	11705 * 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	11706 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11707 * 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	11708 * an open or create call.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11709 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11710 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	11711 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11712
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11713 /* signal post */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11714 char tmp = (char)1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11715
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11716 if(!eve \|\| eve->alive < 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11717 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11718
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11719 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	11720 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11721 return 1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11722 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11723
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11724 /* 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	11725 * 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	11726 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11727 * 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	11728 * an open or create call.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11729 * 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	11730 * or -1 if indefinite.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11731 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11732 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	11733 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11734 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	11735 struct timeval tv, *useme = NULL;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11736 int retval = 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11737 char tmp;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11738
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11739 if(!eve \|\| eve->alive < 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11740 return DW_ERROR_NON_INIT;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11741
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11742 /* 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	11743 if(timeout != -1)
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11744 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11745 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	11746 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	11747
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11748 useme = &tv;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11749 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11750
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11751 FD_ZERO(&rd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11752 FD_SET(eve->alive, &rd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11753
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11754 /* Signal wait */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11755 tmp = (char)2;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11756 write(eve->alive, &tmp, 1);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11757
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11758 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	11759
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11760 /* Signal done waiting. */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11761 tmp = (char)3;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11762 write(eve->alive, &tmp, 1);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11763
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11764 if(retval == 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11765 return DW_ERROR_TIMEOUT;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11766 else if(retval == -1)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11767 return DW_ERROR_INTERRUPT;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11768
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11769 /* 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	11770 * we don't loop endlessly. :)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11771 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11772 read(eve->alive, &tmp, 1);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11773 return 0;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11774 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11775
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11776 /* 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	11777 * 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	11778 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11779 * 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	11780 * an open or create call.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11781 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11782 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	11783 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11784 /* Finally close the domain socket,
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11785 * cleanup will continue in _handle_sem.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11786 */
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11787 if(eve)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11788 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11789 close(eve->alive);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11790 free(eve);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11791 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11792 return 0;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11793 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11794
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11795 /* 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	11796 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	11797 {
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11798 #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	11799 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	11800 [pool drain];
698 e19f69a78f21 Fix for pool being removed and not just drained. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 697 diff changeset	11801 pool = [[NSAutoreleasePool alloc] init];
e19f69a78f21 Fix for pool being removed and not just drained. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 697 diff changeset	11802 pthread_setspecific(_dw_pool_key, pool);
731 6a589a1a42b0 Add dw_window_get_font() mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 730 diff changeset	11803 #endif
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11804 }
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11805
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	11806 /*
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11807 * 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	11808 * 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	11809 * 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	11810 * 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	11811 */
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11812 void API _dw_init_thread(void)
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11813 {
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	11814 /* 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	11815 #if !defined(GARBAGE_COLLECT)
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11816 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	11817 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	11818 #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	11819 _init_colors();
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11820 }
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11821
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	11822 /*
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11823 * 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	11824 * 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	11825 * 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	11826 * 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	11827 */
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11828 void API _dw_deinit_thread(void)
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11829 {
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11830 NSColor *color;
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	11831
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	11832 /* 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	11833 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	11834 [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	11835 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	11836 [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	11837 #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	11838 pool = pthread_getspecific(_dw_pool_key);
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	11839 [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	11840 #endif
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11841 }
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11842
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11843 /*
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11844 * Setup thread independent pools.
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11845 */
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11846 void _dwthreadstart(void *data)
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11847 {
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11848 void (threadfunc)(void ) = NULL;
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11849 void tmp = (void )data;
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11850
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11851 _dw_init_thread();
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	11852
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11853 threadfunc = (void ()(void ))tmp[0];
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11854
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11855 /* Start our thread function */
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11856 threadfunc(tmp[1]);
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11857
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	11858 free(tmp);
1922 a2a8145f3148 Turn off smart text and quote substitution on MLE. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1914 diff changeset	11859
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	11860 _dw_deinit_thread();
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11861 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11862
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	11863 /*
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	11864 * 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	11865 * 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	11866 * 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	11867 */
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	11868 void API dw_font_set_default(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	11869 {
1241 459426f31fb4 Slight thread safety fix on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1239 diff changeset	11870 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	11871 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	11872 [DWDefaultFont retain];
1241 459426f31fb4 Slight thread safety fix on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1239 diff changeset	11873 [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	11874 }
9882b0dfa304 Added an internal Mac function for setting the default Dynamic Windows font. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 743 diff changeset	11875
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11876 /*
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11877 * 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	11878 * Parameters:
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11879 * 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	11880 * 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	11881 */
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11882 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	11883 {
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	11884 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	11885
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	11886 /* 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	11887 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	11888 {
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	11889 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	11890 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	11891
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	11892 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	11893 {
1381 3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	11894 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	11895 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	11896
1381 3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	11897 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	11898 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	11899 *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	11900
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	11901 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	11902
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	11903 /* 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	11904 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	11905 {
1381 3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	11906 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	11907
3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	11908 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	11909 {
1381 3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	11910 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	11911 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	11912 }
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	11913 }
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	11914 }
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	11915 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	11916 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	11917 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	11918
1381 3ba4853d5b78 Initial attempt at dw_app_dir() for OS/2, Windows and Mac... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1378 diff changeset	11919 /* 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	11920 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	11921 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	11922
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	11923 /* 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	11924 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	11925 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	11926 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	11927 /* 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	11928 * 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	11929 */
9a32d4216f24 Make sure we set the locale on Mac and it is UTF-8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1784 diff changeset	11930 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	11931 /* 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	11932 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	11933 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	11934 [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	11935 /* 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	11936 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	11937 /* 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	11938 #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	11939 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	11940 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	11941 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	11942 #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	11943 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	11944 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	11945 _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	11946 /* 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	11947 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	11948 [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	11949 [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	11950 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	11951 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	11952 #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	11953 _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	11954 #else
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11955 /* 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	11956 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	11957 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	11958 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	11959 #endif
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11960 /* 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	11961 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	11962 [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	11963 [thread release];
859 80a88c91ccf6 Implemented vertical centering on text fields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 858 diff changeset	11964 [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	11965 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	11966 }
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11967
830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	11968 /*
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11969 * 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	11970 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11971 * 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	11972 * 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	11973 * 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	11974 * 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	11975 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11976 HSHM dw_named_memory_new(void *dest, int size, char name)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11977 {
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	11978 char namebuf[1025] = {0};
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11979 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	11980
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11981 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	11982 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	11983
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11984 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	11985 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11986 free(handle);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11987 return NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11988 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11989
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11990 ftruncate(handle->fd, size);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11991
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11992 /* 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	11993 *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	11994
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11995 if(*dest == MAP_FAILED)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11996 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11997 close(handle->fd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11998 *dest = NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11999 free(handle);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12000 return NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12001 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12002
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12003 handle->size = size;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12004 handle->sid = getsid(0);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12005 handle->path = strdup(namebuf);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12006
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12007 return handle;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12008 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12009
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12010 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12011 * 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	12012 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12013 * 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	12014 * 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	12015 * 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	12016 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12017 HSHM dw_named_memory_get(void *dest, int size, char name)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12018 {
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	12019 char namebuf[1025];
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12020 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	12021
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12022 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	12023 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	12024
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12025 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	12026 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12027 free(handle);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12028 return NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12029 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12030
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12031 /* 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	12032 *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	12033
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12034 if(*dest == MAP_FAILED)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12035 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12036 close(handle->fd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12037 *dest = NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12038 free(handle);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12039 return NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12040 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12041
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12042 handle->size = size;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12043 handle->sid = -1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12044 handle->path = NULL;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12045
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12046 return handle;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12047 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12048
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12049 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12050 * 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	12051 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12052 * 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	12053 * 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	12054 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12055 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	12056 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12057 struct _dw_unix_shm *h = handle;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12058 int rc = munmap(ptr, h->size);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12059
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12060 close(h->fd);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12061 if(h->path)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12062 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12063 /* 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	12064 * creator of the file.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12065 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12066 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	12067 remove(h->path);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12068 free(h->path);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12069 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12070 return rc;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12071 }
697 830e1f3672b9 Added draining mechanism for threads that don't have run loops. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 696 diff changeset	12072
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12073 /*
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12074 * 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	12075 * Parameters:
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12076 * 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	12077 * 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	12078 * 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	12079 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12080 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	12081 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12082 DWTID thread;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12083 void *tmp = malloc(sizeof(void ) * 2);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12084 int rc;
650 55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12085
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12086 tmp[0] = func;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12087 tmp[1] = data;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12088
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12089 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	12090 if(rc == 0)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12091 return thread;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12092 return (DWTID)-1;
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12093 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12094
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 * Ends execution of current thread immediately.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12097 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12098 void dw_thread_end(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12099 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12100 pthread_exit(NULL);
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12101 }
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12102
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 * Returns the current thread's ID.
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12105 */
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12106 DWTID dw_thread_id(void)
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12107 {
55b677d460e9 Added initial support for a MacOS Cocoa port. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12108 return (DWTID)pthread_self();
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
661 eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12111 /*
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12112 * 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	12113 * Parameters:
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12114 * program: Program name with optional path.
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12115 * 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	12116 * 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	12117 * Returns:
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12118 * -1 on error.
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12119 */
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12120 int dw_exec(char program, int type, char *params)
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12121 {
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12122 int ret = -1;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	12123
738 52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	12124 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	12125 {
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	12126 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	12127 {
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	12128 [[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	12129 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	12130 }
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	12131 else
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	12132 {
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	12133 [[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	12134 }
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	12135 return 0;
52d5ed00f892 Use NSWorkplace to launch GUI applications instead of fork() and exec(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 737 diff changeset	12136 }
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	12137
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12138 if((ret = fork()) == 0)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12139 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12140 int i;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	12141
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12142 for (i = 3; i < 256; i++)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12143 close(i);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12144 setsid();
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	12145
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12146 if(type == DW_EXEC_CON)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12147 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12148 char **tmpargs;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	12149
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12150 if(!params)
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12151 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12152 tmpargs = malloc(sizeof(char *));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12153 tmpargs[0] = NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12154 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12155 else
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12156 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12157 int z = 0;
762 2aaa3f67cfb1 Fix for crashes with generating images from data mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 760 diff changeset	12158
752 cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12159 while(params[z])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12160 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12161 z++;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12162 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12163 tmpargs = malloc(sizeof(char )(z+3));
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12164 z=0;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12165 tmpargs[0] = "xterm";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12166 tmpargs[1] = "-e";
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12167 while(params[z])
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12168 {
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12169 tmpargs[z+2] = params[z];
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12170 z++;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12171 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12172 tmpargs[z+2] = NULL;
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12173 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12174 execvp("xterm", tmpargs);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12175 free(tmpargs);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12176 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12177 /* If we got here exec failed */
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12178 _exit(-1);
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12179 }
cf447811d322 Converted tabs to spaces. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 751 diff changeset	12180 return ret;
661 eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12181 }
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12182
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12183 /*
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12184 * 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	12185 * Parameters:
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12186 * url: Uniform resource locator.
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12187 */
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12188 int dw_browse(char *url)
eee90a788876 Added missing functions needed to build HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 660 diff changeset	12189 {
715 5f8102bd7646 dw_browse() reimplmented so it actually works as expected. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 714 diff changeset	12190 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	12191 [[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	12192 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	12193 }
1137 e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12194
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12195 typedef struct _dwprint
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12196 {
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12197 NSPrintInfo *pi;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12198 int (drawfunc)(HPRINT, HPIXMAP, int, void );
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12199 void *drawdata;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12200 unsigned long flags;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12201 } DWPrint;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12202
1137 e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12203 /*
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12204 * 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	12205 * Parameters:
1152 58b5374355ab Added print jobname parameter to dw_print_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1147 diff changeset	12206 * 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	12207 * 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	12208 * 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	12209 * 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	12210 * 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	12211 * Returns:
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12212 * 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	12213 */
1152 58b5374355ab Added print jobname parameter to dw_print_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1147 diff changeset	12214 HPRINT API dw_print_new(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	12215 {
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12216 DWPrint *print;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12217 NSPrintPanel *panel;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12218 PMPrintSettings settings;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12219 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	12220
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12221 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	12222 {
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12223 return NULL;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12224 }
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12225
1152 58b5374355ab Added print jobname parameter to dw_print_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1147 diff changeset	12226 if(!jobname)
58b5374355ab Added print jobname parameter to dw_print_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1147 diff changeset	12227 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	12228
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12229 print->drawfunc = drawfunc;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12230 print->drawdata = drawdata;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12231 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	12232
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12233 /* Get the page range */
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12234 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	12235 [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	12236 [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	12237 [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	12238 [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	12239 [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	12240 [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	12241 [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	12242 [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	12243 [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	12244
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12245 settings = [pi PMPrintSettings];
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12246 PMSetPageRange(settings, 1, pages);
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12247 PMSetFirstPage(settings, 1, true);
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12248 PMSetLastPage(settings, pages, true);
1152 58b5374355ab Added print jobname parameter to dw_print_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1147 diff changeset	12249 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	12250 [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	12251
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12252 /* Create and show the print panel */
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12253 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	12254 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	12255 {
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12256 free(print);
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12257 return NULL;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12258 }
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12259 /* 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	12260 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	12261
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12262 return print;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12263 }
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12264
1802 aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12265 /*
1137 e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12266 * 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	12267 * Parameters:
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12268 * 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	12269 * 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	12270 * Returns:
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12271 * 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	12272 */
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12273 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	12274 {
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12275 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	12276 NSBitmapImageRep rep, rep2;
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12277 NSPrintInfo *pi;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12278 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	12279 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	12280 NSImage image, flipped;
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12281 NSImageView *iv;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12282 NSSize size;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12283 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	12284 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	12285 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	12286
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12287 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	12288 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	12289
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	12290 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	12291
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12292 /* Figure out the printer/paper size */
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12293 pi = p->pi;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12294 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	12295
bee6fc8119ec Paper size reported on Mac height is for all pages... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1230 diff changeset	12296 /* 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	12297 settings = [pi PMPrintSettings];
bee6fc8119ec Paper size reported on Mac height is for all pages... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1230 diff changeset	12298 PMGetFirstPage(settings, &start);
bee6fc8119ec Paper size reported on Mac height is for all pages... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1230 diff changeset	12299 if(start > 0)
bee6fc8119ec Paper size reported on Mac height is for all pages... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1230 diff changeset	12300 start--;
bee6fc8119ec Paper size reported on Mac height is for all pages... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1230 diff changeset	12301 PMGetLastPage(settings, &end);
bee6fc8119ec Paper size reported on Mac height is for all pages... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1230 diff changeset	12302 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	12303 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	12304 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	12305 [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	12306
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12307 /* 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	12308 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	12309 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	12310 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	12311 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	12312 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	12313
aedf5903db0a Add DW_FCF_TEXTURED window style; relevant only for Mac port. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	12314 /* 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	12315 * to go into the image view.
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12316 */
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12317 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	12318 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	12319 [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	12320 [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	12321 [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	12322 [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	12323 [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	12324 [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	12325
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12326 /* 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	12327 * 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	12328 */
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12329 po = [NSPrintOperation printOperationWithView:iv printInfo:pi];
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12330 [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	12331
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12332 /* Cycle through each page */
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12333 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	12334 {
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12335 /* Call the application's draw function */
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12336 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	12337 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	12338 {
890890c31ba6 Another printing cancel fix for the Mac and updated the readme. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1335 diff changeset	12339 /* 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	12340 _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	12341 #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	12342 /* 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	12343 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	12344 [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	12345 #endif
890890c31ba6 Another printing cancel fix for the Mac and updated the readme. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1335 diff changeset	12346 /* 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	12347 [po runOperation];
890890c31ba6 Another printing cancel fix for the Mac and updated the readme. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1335 diff changeset	12348 /* 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	12349 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	12350 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	12351 }
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12352 }
1143 b1b23de965d7 Fixed using a pointer after being free()ed on Windows and Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1141 diff changeset	12353 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	12354 result = DW_ERROR_NONE;
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12355 /* 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	12356 [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	12357 [flipped release];
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12358 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	12359 dw_pixmap_destroy(pixmap2);
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12360 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	12361 [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	12362 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	12363 return result;
1137 e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12364 }
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12365
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12366 /*
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12367 * 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	12368 * Parameters:
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12369 * 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	12370 */
e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1135 diff changeset	12371 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	12372 {
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12373 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	12374
1141 8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12375 if(p)
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12376 p->drawfunc = NULL;
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12377 }
8d8c73fb27f4 Initial implementation of printing support on Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1137 diff changeset	12378
1783 9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12379 /*
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12380 * 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	12381 * Parameters:
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12382 * 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	12383 * Returns:
1784 86ace55df07b Added UTF8/Wide conversion functions on OS/2 and Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1783 diff changeset	12384 * 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	12385 * 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	12386 */
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12387 wchar_t * API dw_utf8_to_wchar(char *utf8string)
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12388 {
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12389 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	12390 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	12391 if(temp)
86ace55df07b Added UTF8/Wide conversion functions on OS/2 and Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1783 diff changeset	12392 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	12393 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	12394 }
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12395
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12396 /*
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12397 * 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	12398 * Parameters:
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12399 * 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	12400 * Returns:
1784 86ace55df07b Added UTF8/Wide conversion functions on OS/2 and Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1783 diff changeset	12401 * 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	12402 * 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	12403 */
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12404 char * API dw_wchar_to_utf8(wchar_t *wstring)
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12405 {
9de6d1cc8fb8 Put test program code into DEPRECATED #ifdef again to avoid build warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1782 diff changeset	12406 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	12407 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	12408 if(temp)
86ace55df07b Added UTF8/Wide conversion functions on OS/2 and Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1783 diff changeset	12409 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	12410 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	12411 }

Mercurial > dwindows

annotate mac/dw.m @ 2032:5ca399fb2d6f