Mercurial > dwindows
annotate mac/dw.m @ 1990:433b7c772ff0
OS/2: Mostly safe snprintf() for VisualAge.
| author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
|---|---|
| date | Mon, 16 Sep 2019 17:48:21 +0000 |
| parents | 218fce0e3b06 |
| children | e643d280edae |
| 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 |
|
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
|
30 /* Create a define to let us know to include Snow Leopard specific features */ |
|
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 |
|
1936
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
48 #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
|
49 #else |
|
b94b4ad26a05
Minor fixes and changes to remove deprecation warnings in 10.10 and
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1902
diff
changeset
|
50 #define DWModalResponseOK NSOKButton |
|
b94b4ad26a05
Minor fixes and changes to remove deprecation warnings in 10.10 and
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1902
diff
changeset
|
51 #define DWModalResponseCancel NSCancelButton |
|
b94b4ad26a05
Minor fixes and changes to remove deprecation warnings in 10.10 and
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1902
diff
changeset
|
52 #define DWPaperOrientationPortrait NSPortraitOrientation |
|
1936
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
53 #endif |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
54 |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
55 /* 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
|
56 * 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
|
57 */ |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
58 #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
|
59 #define DWButtonTypeSwitch NSButtonTypeSwitch |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
60 #define DWButtonTypeRadio NSButtonTypeRadio |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
61 #define DWButtonTypeMomentaryPushIn NSButtonTypeMomentaryPushIn |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
62 #define DWBezelStyleRegularSquare NSBezelStyleRegularSquare |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
63 #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
|
64 #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
|
65 #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
|
66 #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
|
67 #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
|
68 #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
|
69 #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
|
70 #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
|
71 #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
|
72 #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
|
73 #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
|
74 #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
|
75 #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
|
76 #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
|
77 #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
|
78 #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
|
79 #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
|
80 #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
|
81 #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
|
82 #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
|
83 #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
|
84 #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
|
85 #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
|
86 #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
|
87 #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
|
88 #define DWWindowStyleMaskResizable NSWindowStyleMaskResizable |
|
1936
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
89 #define BUILDING_FOR_SIERRA |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
90 #else |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
91 #define DWButtonTypeSwitch NSSwitchButton |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
92 #define DWButtonTypeRadio NSRadioButton |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
93 #define DWButtonTypeMomentaryPushIn NSMomentaryPushInButton |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
94 #define DWBezelStyleRegularSquare NSRegularSquareBezelStyle |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
95 #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
|
96 #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
|
97 #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
|
98 #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
|
99 #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
|
100 #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
|
101 #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
|
102 #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
|
103 #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
|
104 #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
|
105 #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
|
106 #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
|
107 #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
|
108 #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
|
109 #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
|
110 #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
|
111 #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
|
112 #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
|
113 #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
|
114 #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
|
115 #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
|
116 #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
|
117 #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
|
118 #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
|
119 #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
|
120 #define DWWindowStyleMaskResizable NSResizableWindowMask |
|
1936
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
121 #endif |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
122 |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
123 /* 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
|
124 * 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
|
125 */ |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
126 #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
|
127 #define DWControlStateValueOff NSControlStateValueOff |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
128 #define DWControlStateValueOn NSControlStateValueOn |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
129 #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
|
130 #else |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
131 #define DWControlStateValueOff NSOffState |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
132 #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
|
133 #endif |
|
b94b4ad26a05
Minor fixes and changes to remove deprecation warnings in 10.10 and
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1902
diff
changeset
|
134 |
|
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
|
135 /* 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
|
136 * 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
|
137 */ |
|
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
|
138 #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
|
139 #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
|
140 #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
|
141 #else |
|
1941
b498fb0360fc
Mac: 10.14 seems to have drastically changed the drawing mechanism.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1940
diff
changeset
|
142 #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
|
143 #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
|
144 |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
145 /* 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
|
146 * 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
|
147 */ |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
148 #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
|
149 #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
|
150 #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
|
151 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
|
152 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
|
153 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
|
154 [_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
|
155 #define DW_FUNCTION_ADD_PARAM1(param1) [_args addPointer:(void *)¶m1]; |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
156 #define DW_FUNCTION_ADD_PARAM2(param1, param2) [_args addPointer:(void *)¶m1]; \ |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
157 [_args addPointer:(void *)¶m2]; |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
158 #define DW_FUNCTION_ADD_PARAM3(param1, param2, param3) [_args addPointer:(void *)¶m1]; \ |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
159 [_args addPointer:(void *)¶m2]; \ |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
160 [_args addPointer:(void *)¶m3]; |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
161 #define DW_FUNCTION_ADD_PARAM4(param1, param2, param3, param4) [_args addPointer:(void *)¶m1]; \ |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
162 [_args addPointer:(void *)¶m2]; \ |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
163 [_args addPointer:(void *)¶m3]; \ |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
164 [_args addPointer:(void *)¶m4]; |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
165 #define DW_FUNCTION_ADD_PARAM5(param1, param2, param3, param4, param5) [_args addPointer:(void *)¶m1]; \ |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
166 [_args addPointer:(void *)¶m2]; \ |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
167 [_args addPointer:(void *)¶m3]; \ |
|
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 *)¶m4]; \ |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
169 [_args addPointer:(void *)¶m5]; |
|
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_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
|
171 [_args addPointer:(void *)¶m1]; \ |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
172 [_args addPointer:(void *)¶m2]; \ |
|
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 *)¶m3]; \ |
|
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 *)¶m4]; \ |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
175 [_args addPointer:(void *)¶m5]; \ |
|
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 *)¶m6]; |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
177 #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
|
178 [_args addPointer:(void *)¶m1]; \ |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
179 [_args addPointer:(void *)¶m2]; \ |
|
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 *)¶m3]; \ |
|
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 *)¶m4]; \ |
|
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 *)¶m5]; \ |
|
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 *)¶m6]; \ |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
184 [_args addPointer:(void *)¶m7]; |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
185 #define DW_FUNCTION_ADD_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
|
186 [_args addPointer:(void *)¶m1]; \ |
|
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 *)¶m2]; \ |
|
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 *)¶m3]; \ |
|
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 *)¶m4]; \ |
|
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 *)¶m5]; \ |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
191 [_args addPointer:(void *)¶m6]; \ |
|
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 *)¶m7]; \ |
|
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 *)¶m8]; |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
194 #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
|
195 [_args addPointer:(void *)¶m1]; \ |
|
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 *)¶m2]; \ |
|
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 *)¶m3]; \ |
|
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 *)¶m4]; \ |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
199 [_args addPointer:(void *)¶m5]; \ |
|
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 *)¶m6]; \ |
|
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 *)¶m7]; \ |
|
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 *)¶m8]; \ |
|
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 *)¶m9]; |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
204 #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
|
205 #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
|
206 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
|
207 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
|
208 #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
|
209 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
|
210 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
|
211 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
|
212 #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
|
213 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
|
214 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
|
215 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
|
216 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
|
217 #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
|
218 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 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
|
220 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
|
221 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
|
222 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
|
223 #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
|
224 vartype1 param1 = *((vartype1 *)[_args pointerAtIndex:1]); \ |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
225 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
|
226 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
|
227 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
|
228 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
|
229 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
|
230 #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
|
231 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
|
232 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
|
233 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
|
234 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
|
235 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
|
236 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
|
237 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
|
238 #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
|
239 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
|
240 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
|
241 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
|
242 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
|
243 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
|
244 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
|
245 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
|
246 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
|
247 #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
|
248 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
|
249 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
|
250 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
|
251 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
|
252 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
|
253 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
|
254 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
|
255 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
|
256 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
|
257 #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
|
258 #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
|
259 [_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
|
260 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
|
261 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
|
262 #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
|
263 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
|
264 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
|
265 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
|
266 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
|
267 [_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
|
268 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
|
269 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
|
270 #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
|
271 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
|
272 [_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
|
273 #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
|
274 #else |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
275 /* 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
|
276 #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
|
277 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
|
278 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
|
279 _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
|
280 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
|
281 [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
|
282 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
|
283 _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
|
284 #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
|
285 #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
|
286 #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
|
287 #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
|
288 #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
|
289 #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
|
290 #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
|
291 #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
|
292 #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
|
293 #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
|
294 #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
|
295 #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
|
296 #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
|
297 #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
|
298 #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
|
299 #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
|
300 #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
|
301 #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
|
302 #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
|
303 #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
|
304 #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
|
305 #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
|
306 #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
|
307 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
|
308 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
|
309 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
|
310 _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
|
311 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
|
312 _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
|
313 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
|
314 #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
|
315 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
|
316 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
|
317 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
|
318 _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
|
319 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
|
320 _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
|
321 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
|
322 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
|
323 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
|
324 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
|
325 #endif |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
326 |
|
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
|
327 /* Apparently the WKWebKit API is only enabled on intel 64bit... |
|
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
|
328 * Causing build failures on 32bit builds, so this should allow |
|
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
|
329 * WKWebKit on intel 64 and the old WebKit on intel 32 bit and earlier. |
|
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
|
330 */ |
|
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
|
331 #if WK_API_ENABLED |
|
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
|
332 #define DWWebView WKWebView |
|
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
|
333 #else |
|
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
|
334 #define DWWebView WebView |
|
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
|
335 #endif |
|
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
|
336 |
|
657
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
337 unsigned long _colors[] = |
|
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
338 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
339 0x00000000, /* 0 black */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
340 0x000000bb, /* 1 red */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
341 0x0000bb00, /* 2 green */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
342 0x0000aaaa, /* 3 yellow */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
343 0x00cc0000, /* 4 blue */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
344 0x00bb00bb, /* 5 magenta */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
345 0x00bbbb00, /* 6 cyan */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
346 0x00bbbbbb, /* 7 white */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
347 0x00777777, /* 8 grey */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
348 0x000000ff, /* 9 bright red */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
349 0x0000ff00, /* 10 bright green */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
350 0x0000eeee, /* 11 bright yellow */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
351 0x00ff0000, /* 12 bright blue */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
352 0x00ff00ff, /* 13 bright magenta */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
353 0x00eeee00, /* 14 bright cyan */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
354 0x00ffffff, /* 15 bright white */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
355 0xff000000 /* 16 default color */ |
|
657
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
356 }; |
|
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
357 |
|
938
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
358 /* |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
359 * 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
|
360 */ |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
361 #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
|
362 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
|
363 { |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
364 ".png", |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
365 ".ico", |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
366 ".icns", |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
367 ".gif", |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
368 ".jpg", |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
369 ".jpeg", |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
370 ".tiff", |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
371 ".bmp" |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
372 }; |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
373 |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
374 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
|
375 { |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
376 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
|
377 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
|
378 |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
379 /* 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
|
380 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
|
381 { |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
382 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
|
383 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
|
384 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
|
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 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
|
387 break; |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
388 } |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
389 } |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
390 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
|
391 { |
|
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
|
392 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
|
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 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
|
395 } |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
396 |
|
1958
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
397 /* 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
|
398 unsigned long _get_color(unsigned long thiscolor) |
|
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
399 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
400 if(thiscolor & DW_RGB_COLOR) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
401 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
402 return thiscolor & ~DW_RGB_COLOR; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
403 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
404 else if(thiscolor < 17) |
|
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 _colors[thiscolor]; |
|
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 return 0; |
|
657
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
409 } |
|
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
410 |
|
1958
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
411 /* 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
|
412 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
|
413 { |
|
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
414 #ifdef BUILDING_FOR_MOJAVE |
|
1984
09a102c92788
Mac: Fix building on MacOS 10.7 Lion.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1983
diff
changeset
|
415 NSAppearance *appearance = [object effectiveAppearance]; |
|
09a102c92788
Mac: Fix building on MacOS 10.7 Lion.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1983
diff
changeset
|
416 |
|
1958
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
417 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
|
418 { |
|
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
419 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
|
420 NSAppearanceNameAqua, |
|
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
421 NSAppearanceNameDarkAqua]]; |
|
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
422 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
|
423 } |
|
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
424 #endif |
|
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
425 return NO; |
|
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
426 } |
|
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
427 |
|
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
|
428 /* 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
|
429 #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
|
430 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
|
431 #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
|
432 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
|
433 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
|
434 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
|
435 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
|
436 |
|
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 /* 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
|
438 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
|
439 { |
|
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 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
|
441 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
|
442 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
|
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 |
|
652
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
445 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
|
446 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
447 struct _sighandler *next; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
448 ULONG message; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
449 HWND window; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
450 int id; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
451 void *signalfunction; |
|
1853
4790589f52a9
Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1849
diff
changeset
|
452 void *discfunction; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
453 void *data; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
454 |
|
652
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
455 } SignalHandler; |
|
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
456 |
|
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
457 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
|
458 |
|
678
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
459 /* Some internal prototypes */ |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
460 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
|
461 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
|
462 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
|
463 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
|
464 NSGraphicsContext *_dw_draw_context(NSBitmapImageRep *image); |
|
678
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
465 |
|
1419
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
466 /* 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
|
467 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
|
468 { |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
469 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
|
470 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
|
471 |
|
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 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
|
473 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
|
474 |
|
1419
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
475 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
|
476 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
|
477 { |
|
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 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
|
479 } |
|
1419
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
480 } |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
481 |
|
652
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
482 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
|
483 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
484 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
|
485 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
486 /* Find any callbacks for this function */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
487 while(tmp) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
488 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
489 if(tmp->message == messageid && window == tmp->window) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
490 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
491 return tmp; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
492 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
493 tmp = tmp->next; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
494 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
495 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
|
496 } |
|
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
497 |
|
703
329736825f9b
Implemented more of the missing event/signal handlers and other code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
702
diff
changeset
|
498 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
|
499 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
500 ULONG message; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
501 char name[30]; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
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 } SignalList; |
|
329736825f9b
Implemented more of the missing event/signal handlers and other code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
702
diff
changeset
|
504 |
|
329736825f9b
Implemented more of the missing event/signal handlers and other code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
702
diff
changeset
|
505 /* List of signals */ |
|
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
|
506 #define SIGNALMAX 17 |
|
703
329736825f9b
Implemented more of the missing event/signal handlers and other code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
702
diff
changeset
|
507 |
|
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 SignalTranslate[SIGNALMAX] = { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
509 { 1, DW_SIGNAL_CONFIGURE }, |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
510 { 2, DW_SIGNAL_KEY_PRESS }, |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
511 { 3, DW_SIGNAL_BUTTON_PRESS }, |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
512 { 4, DW_SIGNAL_BUTTON_RELEASE }, |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
513 { 5, DW_SIGNAL_MOTION_NOTIFY }, |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
514 { 6, DW_SIGNAL_DELETE }, |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
515 { 7, DW_SIGNAL_EXPOSE }, |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
516 { 8, DW_SIGNAL_CLICKED }, |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
517 { 9, DW_SIGNAL_ITEM_ENTER }, |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
518 { 10, DW_SIGNAL_ITEM_CONTEXT }, |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
519 { 11, DW_SIGNAL_LIST_SELECT }, |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
520 { 12, DW_SIGNAL_ITEM_SELECT }, |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
521 { 13, DW_SIGNAL_SET_FOCUS }, |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
522 { 14, DW_SIGNAL_VALUE_CHANGED }, |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
523 { 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
|
524 { 16, DW_SIGNAL_TREE_EXPAND }, |
|
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
|
525 { 17, DW_SIGNAL_COLUMN_CLICK } |
|
703
329736825f9b
Implemented more of the missing event/signal handlers and other code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
702
diff
changeset
|
526 }; |
|
329736825f9b
Implemented more of the missing event/signal handlers and other code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
702
diff
changeset
|
527 |
|
1419
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
528 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
|
529 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
530 SignalHandler *handler = _get_handler(object, message); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
531 /* 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
|
532 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
533 if(handler) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
534 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
535 switch(message) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
536 { |
|
703
329736825f9b
Implemented more of the missing event/signal handlers and other code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
702
diff
changeset
|
537 /* Timer event */ |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
538 case 0: |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
539 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
540 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
|
541 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
542 if(!timerfunc(handler->data)) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
543 dw_timer_disconnect(handler->id); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
544 return 0; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
545 } |
|
703
329736825f9b
Implemented more of the missing event/signal handlers and other code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
702
diff
changeset
|
546 /* Configure/Resize event */ |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
547 case 1: |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
548 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
549 int (*sizefunc)(HWND, int, int, void *) = handler->signalfunction; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
550 NSSize size; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
551 |
|
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
|
552 if([object isKindOfClass:[NSWindow class]]) |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
553 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
554 NSWindow *window = object; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
555 size = [[window contentView] frame].size; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
556 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
557 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
558 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
559 NSView *view = object; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
560 size = [view frame].size; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
561 } |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
562 |
|
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
|
563 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
|
564 { |
|
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
|
565 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
|
566 } |
|
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
|
567 return 0; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
568 } |
|
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
|
569 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
|
570 { |
|
1748
e4fcd1e81f0d
Added optional utf8 parameter to keypress callback on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1744
diff
changeset
|
571 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
|
572 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
|
573 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
|
574 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
|
575 char *utf8 = NULL, ch = '\0'; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
576 |
|
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
|
577 /* 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
|
578 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
|
579 { |
|
1748
e4fcd1e81f0d
Added optional utf8 parameter to keypress callback on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1744
diff
changeset
|
580 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
|
581 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
|
582 { |
|
37c8d2b4cec5
Initial key press event/signal handling... does not seem to trap on all controls...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
722
diff
changeset
|
583 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
|
584 } |
|
1748
e4fcd1e81f0d
Added optional utf8 parameter to keypress callback on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1744
diff
changeset
|
585 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
|
586 } |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
587 |
|
1748
e4fcd1e81f0d
Added optional utf8 parameter to keypress callback on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1744
diff
changeset
|
588 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
|
589 } |
|
703
329736825f9b
Implemented more of the missing event/signal handlers and other code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
702
diff
changeset
|
590 /* Button press and release event */ |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
591 case 3: |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
592 case 4: |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
593 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
594 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
|
595 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
|
596 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
|
597 |
|
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
|
598 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
|
599 { |
|
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
|
600 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
|
601 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
|
602 |
|
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
|
603 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
|
604 |
|
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
|
605 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
|
606 { |
|
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 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
|
608 } |
|
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
|
609 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
|
610 { |
|
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 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
|
612 } |
|
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
|
613 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
|
614 { |
|
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
|
615 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
|
616 } |
|
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
|
617 } |
|
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
|
618 |
|
954
cfb12bf3bb06
Fixes for some more coordinate system issues on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
953
diff
changeset
|
619 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
|
620 } |
|
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
|
621 /* 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
|
622 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
|
623 { |
|
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
|
624 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
|
625 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
|
626 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
|
627 SEL spmb = NSSelectorFromString(@"pressedMouseButtons"); |
|
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
|
628 IMP ipmb = [[NSEvent class] respondsToSelector:spmb] ? [[NSEvent class] methodForSelector:spmb] : 0; |
|
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
|
629 int buttonmask = ipmb ? (int)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
|
630 |
|
954
cfb12bf3bb06
Fixes for some more coordinate system issues on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
953
diff
changeset
|
631 return motionfunc(object, (int)p.x, (int)p.y, 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
|
632 } |
|
703
329736825f9b
Implemented more of the missing event/signal handlers and other code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
702
diff
changeset
|
633 /* Window close event */ |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
634 case 6: |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
635 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
636 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
|
637 return closefunc(object, handler->data); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
638 } |
|
703
329736825f9b
Implemented more of the missing event/signal handlers and other code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
702
diff
changeset
|
639 /* Window expose/draw event */ |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
640 case 7: |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
641 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
642 DWExpose exp; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
643 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
|
644 NSRect rect = [object frame]; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
645 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
646 exp.x = rect.origin.x; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
647 exp.y = rect.origin.y; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
648 exp.width = rect.size.width; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
649 exp.height = rect.size.height; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
650 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
|
651 #ifndef BUILDING_FOR_MOJAVE |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
652 [[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
|
653 #endif |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
654 return result; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
655 } |
|
703
329736825f9b
Implemented more of the missing event/signal handlers and other code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
702
diff
changeset
|
656 /* Clicked event for buttons and menu items */ |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
657 case 8: |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
658 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
659 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
|
660 |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
661 return clickfunc(object, handler->data); |
|
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 /* 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
|
664 case 9: |
|
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
665 { |
|
1871
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
666 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
|
667 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
|
668 |
|
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
669 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
|
670 } |
|
703
329736825f9b
Implemented more of the missing event/signal handlers and other code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
702
diff
changeset
|
671 /* Container context menu event */ |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
672 case 10: |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
673 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
674 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
|
675 char *text = (char *)event; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
676 void *user = NULL; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
677 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
|
678 |
|
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
|
679 /* 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
|
680 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
|
681 { |
|
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
|
682 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
|
683 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
|
684 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
|
685 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
|
686 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
|
687 { |
|
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
|
688 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
|
689 } |
|
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
|
690 } |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
691 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
692 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
|
693 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
694 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
|
695 } |
|
703
329736825f9b
Implemented more of the missing event/signal handlers and other code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
702
diff
changeset
|
696 /* 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
|
697 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
|
698 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
|
699 { |
|
329736825f9b
Implemented more of the missing event/signal handlers and other code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
702
diff
changeset
|
700 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
|
701 int selected = DW_POINTER_TO_INT(event); |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
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 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
|
704 } |
|
329736825f9b
Implemented more of the missing event/signal handlers and other code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
702
diff
changeset
|
705 /* Tree class selection event */ |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
706 case 12: |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
707 { |
|
709
5a268d5f1cfa
Fixes for tree event handling. Still more to come shortly...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
708
diff
changeset
|
708 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
|
709 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
|
710 void *user = NULL; |
|
5a268d5f1cfa
Fixes for tree event handling. Still more to come shortly...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
708
diff
changeset
|
711 id item = nil; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
712 |
|
710
78460ff977c1
Finishing up tree event/signal handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
709
diff
changeset
|
713 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
|
714 { |
|
5a268d5f1cfa
Fixes for tree event handling. Still more to come shortly...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
708
diff
changeset
|
715 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
|
716 NSString *nstr = [item objectAtIndex:1]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
717 |
|
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
|
718 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
|
719 { |
|
01107d8e033e
Fixed the scrollbar maximum range to be correct. Also added some MLE code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
711
diff
changeset
|
720 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
|
721 } |
|
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
|
722 |
|
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 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
|
724 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
|
725 { |
|
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
|
726 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
|
727 } |
|
709
5a268d5f1cfa
Fixes for tree event handling. Still more to come shortly...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
708
diff
changeset
|
728 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
|
729 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
|
730 { |
|
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
|
731 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
|
732 } |
|
709
5a268d5f1cfa
Fixes for tree event handling. Still more to come shortly...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
708
diff
changeset
|
733 return result; |
|
5a268d5f1cfa
Fixes for tree event handling. Still more to come shortly...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
708
diff
changeset
|
734 } |
|
1874
71c8a45b2a35
Fixes for Mac code and allocate and free duplicates of title strings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1871
diff
changeset
|
735 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
|
736 { |
|
71c8a45b2a35
Fixes for Mac code and allocate and free duplicates of title strings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1871
diff
changeset
|
737 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
|
738 |
|
1874
71c8a45b2a35
Fixes for Mac code and allocate and free duplicates of title strings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1871
diff
changeset
|
739 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
|
740 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
|
741 } |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
742 |
|
709
5a268d5f1cfa
Fixes for tree event handling. Still more to come shortly...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
708
diff
changeset
|
743 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
|
744 } |
|
703
329736825f9b
Implemented more of the missing event/signal handlers and other code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
702
diff
changeset
|
745 /* 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
|
746 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
|
747 { |
|
329736825f9b
Implemented more of the missing event/signal handlers and other code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
702
diff
changeset
|
748 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
|
749 |
|
703
329736825f9b
Implemented more of the missing event/signal handlers and other code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
702
diff
changeset
|
750 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
|
751 } |
|
329736825f9b
Implemented more of the missing event/signal handlers and other code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
702
diff
changeset
|
752 /* 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
|
753 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
|
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 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
|
756 int pageid = DW_POINTER_TO_INT(event); |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
757 |
|
703
329736825f9b
Implemented more of the missing event/signal handlers and other code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
702
diff
changeset
|
758 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
|
759 } |
|
722
5a8d5161651d
Implemented tree expand event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
721
diff
changeset
|
760 case 16: |
|
5a8d5161651d
Implemented tree expand event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
721
diff
changeset
|
761 { |
|
5a8d5161651d
Implemented tree expand event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
721
diff
changeset
|
762 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
|
763 |
|
722
5a8d5161651d
Implemented tree expand event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
721
diff
changeset
|
764 return treeexpandfunc(handler->window, (HTREEITEM)event, handler->data); |
|
5a8d5161651d
Implemented tree expand event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
721
diff
changeset
|
765 } |
|
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
|
766 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
|
767 { |
|
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
|
768 int (*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
|
769 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
|
770 |
|
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
|
771 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
|
772 } |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
773 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
774 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
775 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
|
776 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
777 |
|
1419
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
778 /* Sub function to handle redraws */ |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
779 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
|
780 { |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
781 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
|
782 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
|
783 _dw_redraw(nil, FALSE); |
|
1419
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
784 return ret; |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
785 } |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
786 |
|
657
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
787 /* Subclass for the Timer type */ |
|
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
788 @interface DWTimerHandler : NSObject { } |
|
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
789 -(void)runTimer:(id)sender; |
|
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
790 @end |
|
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
791 |
|
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
792 @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
|
793 -(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
|
794 @end |
|
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
795 |
|
654
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
796 NSApplication *DWApp; |
|
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
797 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
|
798 NSFont *DWDefaultFont; |
|
657
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
799 DWTimerHandler *DWHandler; |
|
654
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
800 #if !defined(GARBAGE_COLLECT) |
|
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
801 NSAutoreleasePool *pool; |
|
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
802 #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
|
803 #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
|
804 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
|
805 #else |
|
661
eee90a788876
Added missing functions needed to build HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
660
diff
changeset
|
806 HWND _DWLastDrawable; |
|
1949
c71e5da5b801
Mac: Fix mojave #ifdefs so it builds pre-mojave.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1948
diff
changeset
|
807 #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
|
808 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
|
809 |
|
1558
9c5d3ac5bec5
Attempted fix on Mac for 10.5 menu event delay issue.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1557
diff
changeset
|
810 /* 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
|
811 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
|
812 { |
|
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
|
813 [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
|
814 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
|
815 modifierFlags:0 |
|
9c5d3ac5bec5
Attempted fix on Mac for 10.5 menu event delay issue.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1557
diff
changeset
|
816 timestamp:0 |
|
9c5d3ac5bec5
Attempted fix on Mac for 10.5 menu event delay issue.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1557
diff
changeset
|
817 windowNumber:0 |
|
9c5d3ac5bec5
Attempted fix on Mac for 10.5 menu event delay issue.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1557
diff
changeset
|
818 context:NULL |
|
9c5d3ac5bec5
Attempted fix on Mac for 10.5 menu event delay issue.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1557
diff
changeset
|
819 subtype:0 |
|
9c5d3ac5bec5
Attempted fix on Mac for 10.5 menu event delay issue.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1557
diff
changeset
|
820 data1:0 |
|
9c5d3ac5bec5
Attempted fix on Mac for 10.5 menu event delay issue.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1557
diff
changeset
|
821 data2:0] |
|
9c5d3ac5bec5
Attempted fix on Mac for 10.5 menu event delay issue.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1557
diff
changeset
|
822 atStart:NO]; |
|
9c5d3ac5bec5
Attempted fix on Mac for 10.5 menu event delay issue.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1557
diff
changeset
|
823 } |
|
9c5d3ac5bec5
Attempted fix on Mac for 10.5 menu event delay issue.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1557
diff
changeset
|
824 |
|
699
b79300831495
Offload some drawing functions to the main thread to prevent focus deadlocks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
698
diff
changeset
|
825 /* 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
|
826 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
|
827 { |
|
b79300831495
Offload some drawing functions to the main thread to prevent focus deadlocks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
698
diff
changeset
|
828 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
|
829 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
|
830 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
|
831 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
|
832 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
|
833 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
|
834 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
|
835 int ysrc; |
|
1247
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
836 int srcwidth; |
|
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
837 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
|
838 } DWBitBlt; |
|
b79300831495
Offload some drawing functions to the main thread to prevent focus deadlocks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
698
diff
changeset
|
839 |
|
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
|
840 /* 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
|
841 @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
|
842 -(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
|
843 #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
|
844 -(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
|
845 #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
|
846 -(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
|
847 -(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
|
848 -(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
|
849 @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
|
850 |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
851 @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
|
852 { |
|
1517
6506f29dfefc
Implement automatic checking and unchecking of menu items on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1513
diff
changeset
|
853 int check; |
|
6506f29dfefc
Implement automatic checking and unchecking of menu items on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1513
diff
changeset
|
854 } |
|
6506f29dfefc
Implement automatic checking and unchecking of menu items on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1513
diff
changeset
|
855 -(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
|
856 -(int)check; |
|
6506f29dfefc
Implement automatic checking and unchecking of menu items on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1513
diff
changeset
|
857 -(void)dealloc; |
|
6506f29dfefc
Implement automatic checking and unchecking of menu items on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1513
diff
changeset
|
858 @end |
|
6506f29dfefc
Implement automatic checking and unchecking of menu items on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1513
diff
changeset
|
859 |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
860 /* 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
|
861 * 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
|
862 * basically everything. Was hoping to add methods |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
863 * 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
|
864 * 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
|
865 * going to work. -Brian |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
866 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
867 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
868 /* Subclass for a box type */ |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
869 @interface DWBox : NSView |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
870 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
871 Box *box; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
872 void *userdata; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
873 NSColor *bgcolor; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
874 } |
|
678
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
875 -(id)init; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
876 -(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
|
877 -(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
|
878 -(id)contentView; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
879 -(void *)userdata; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
880 -(void)setUserdata:(void *)input; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
881 -(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
|
882 -(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
|
883 -(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
|
884 -(void)mouseUp:(NSEvent *)theEvent; |
|
701
c91a1b345f2e
Fix for button press and context menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
700
diff
changeset
|
885 -(NSMenu *)menuForEvent:(NSEvent *)theEvent; |
|
c91a1b345f2e
Fix for button press and context menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
700
diff
changeset
|
886 -(void)rightMouseUp:(NSEvent *)theEvent; |
|
c91a1b345f2e
Fix for button press and context menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
700
diff
changeset
|
887 -(void)otherMouseDown:(NSEvent *)theEvent; |
|
c91a1b345f2e
Fix for button press and context menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
700
diff
changeset
|
888 -(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
|
889 -(void)keyDown:(NSEvent *)theEvent; |
|
657
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
890 -(void)setColor:(unsigned long)input; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
891 @end |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
892 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
893 @implementation DWBox |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
894 -(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
|
895 { |
|
e426de6e6c7c
Changes to make the resize function more like on the other platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
665
diff
changeset
|
896 self = [super init]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
897 |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
898 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
|
899 { |
|
e426de6e6c7c
Changes to make the resize function more like on the other platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
665
diff
changeset
|
900 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
|
901 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
|
902 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
|
903 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
|
904 } |
|
e426de6e6c7c
Changes to make the resize function more like on the other platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
665
diff
changeset
|
905 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
|
906 } |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
907 -(void)dealloc |
|
678
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
908 { |
|
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
909 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
|
910 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
|
911 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
|
912 free(box); |
|
678
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
913 _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
|
914 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
|
915 [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
|
916 } |
|
e426de6e6c7c
Changes to make the resize function more like on the other platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
665
diff
changeset
|
917 -(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
|
918 -(id)contentView { return self; } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
919 -(void *)userdata { return userdata; } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
920 -(void)setUserdata:(void *)input { userdata = input; } |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
921 -(void)drawRect:(NSRect)rect |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
922 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
923 if(bgcolor) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
924 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
925 [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
|
926 NSRectFill([self bounds]); |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
927 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
928 } |
|
652
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
929 -(BOOL)isFlipped { return YES; } |
|
701
c91a1b345f2e
Fix for button press and context menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
700
diff
changeset
|
930 -(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
|
931 -(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
|
932 -(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
|
933 -(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
|
934 -(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
|
935 -(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
|
936 -(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
|
937 -(void)setColor:(unsigned long)input |
|
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
938 { |
|
755
f574028932cc
Fix for crash when changing background colors, needed retain and release.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
754
diff
changeset
|
939 id orig = bgcolor; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
940 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
941 if(input == _colors[DW_CLR_DEFAULT]) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
942 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
943 bgcolor = nil; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
944 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
945 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
946 { |
|
755
f574028932cc
Fix for crash when changing background colors, needed retain and release.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
754
diff
changeset
|
947 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
|
948 [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
|
949 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
|
950 } |
|
68f923e57542
Attempt at resetting default colors with DW_CLR_DEFAULT on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1843
diff
changeset
|
951 [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
|
952 [orig release]; |
|
657
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
953 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
954 @end |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
955 |
|
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
|
956 /* 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
|
957 @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
|
958 { |
|
fc6a626a96cc
Initial groupbox support. Sizing of the content frame is not quite right yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
768
diff
changeset
|
959 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
|
960 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
|
961 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
|
962 } |
|
fc6a626a96cc
Initial groupbox support. Sizing of the content frame is not quite right yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
768
diff
changeset
|
963 -(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
|
964 -(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
|
965 -(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
|
966 @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
|
967 |
|
fc6a626a96cc
Initial groupbox support. Sizing of the content frame is not quite right yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
768
diff
changeset
|
968 @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
|
969 -(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
|
970 -(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
|
971 -(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
|
972 -(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
|
973 { |
|
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
|
974 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
|
975 |
|
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
|
976 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
|
977 { |
|
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
|
978 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
|
979 [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
|
980 } |
|
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
|
981 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
|
982 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
|
983 |
|
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
|
984 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
|
985 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
|
986 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
|
987 } |
|
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
|
988 -(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
|
989 @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
|
990 |
|
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
|
991 @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
|
992 { |
|
d7eafaa054ab
Added support for dw_window_redraw() causing splitbar panes to redraw without
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1100
diff
changeset
|
993 int redraw; |
|
1489
4c1c44af201a
Added auto-positioning and auto-sizing code for Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1478
diff
changeset
|
994 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
|
995 } |
|
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
|
996 -(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
|
997 -(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
|
998 -(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
|
999 -(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
|
1000 -(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
|
1001 -(int)shown; |
|
4c1c44af201a
Added auto-positioning and auto-sizing code for Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1478
diff
changeset
|
1002 -(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
|
1003 @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
|
1004 |
|
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
|
1005 @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
|
1006 -(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
|
1007 { |
|
1133
25bea6526ca1
Similar Mac fix to what I just commited on Windows...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1130
diff
changeset
|
1008 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
|
1009 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
|
1010 { |
|
ab73d0269a5b
Ensure default keypress event is not processed if handler returns 1
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1128
diff
changeset
|
1011 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
|
1012 } |
|
1133
25bea6526ca1
Similar Mac fix to what I just commited on Windows...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1130
diff
changeset
|
1013 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
|
1014 [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
|
1015 } |
|
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
|
1016 -(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
|
1017 -(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
|
1018 -(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
|
1019 -(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
|
1020 -(int)shown { return shown; } |
|
4c1c44af201a
Added auto-positioning and auto-sizing code for Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1478
diff
changeset
|
1021 -(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
|
1022 -(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
|
1023 @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
|
1024 |
|
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
|
1025 /* 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
|
1026 @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
|
1027 { |
|
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
|
1028 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
|
1029 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
|
1030 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
|
1031 #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
|
1032 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
|
1033 #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
|
1034 } |
|
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
|
1035 -(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
|
1036 -(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
|
1037 -(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
|
1038 -(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
|
1039 -(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
|
1040 -(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
|
1041 #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
|
1042 -(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
|
1043 #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
|
1044 -(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
|
1045 -(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
|
1046 -(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
|
1047 -(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
|
1048 -(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
|
1049 -(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
|
1050 -(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
|
1051 -(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
|
1052 -(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
|
1053 @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
|
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 @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
|
1056 -(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
|
1057 -(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
|
1058 -(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
|
1059 -(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
|
1060 -(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
|
1061 size = input; |
|
1949
c71e5da5b801
Mac: Fix mojave #ifdefs so it builds pre-mojave.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1948
diff
changeset
|
1062 #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
|
1063 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
|
1064 { |
|
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
|
1065 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
|
1066 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
|
1067 [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
|
1068 [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
|
1069 } |
|
1949
c71e5da5b801
Mac: Fix mojave #ifdefs so it builds pre-mojave.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1948
diff
changeset
|
1070 #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
|
1071 } |
|
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
|
1072 -(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
|
1073 #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
|
1074 -(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
|
1075 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
|
1076 { |
|
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
|
1077 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
|
1078 [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
|
1079 } |
|
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
|
1080 /* 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
|
1081 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
|
1082 [_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
|
1083 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
|
1084 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1085 #endif |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
1086 -(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
|
1087 { |
|
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
|
1088 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
|
1089 _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
|
1090 } |
|
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
|
1091 -(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
|
1092 -(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
|
1093 -(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
|
1094 -(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
|
1095 -(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
|
1096 -(void)mouseDragged:(NSEvent *)theEvent { _event_handler(self, theEvent, 5); } |
|
1967
22c96cd42eb8
Mac: Another attempt at fixing the drawRect issue, the last fix resulted in
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1965
diff
changeset
|
1097 -(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
|
1098 -(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
|
1099 _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
|
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 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
|
1102 { |
|
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
|
1103 [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
|
1104 [_DWDirtyDrawables removeObject:self]; |
|
1967
22c96cd42eb8
Mac: Another attempt at fixing the drawRect issue, the last fix resulted in
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1965
diff
changeset
|
1105 [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
|
1106 } |
|
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
|
1107 #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
|
1108 } |
|
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
|
1109 -(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
|
1110 -(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
|
1111 -(void)dealloc { |
|
3aef9be654ce
Mac: Fix pre-mojave build, cached render image not available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1946
diff
changeset
|
1112 UserData *root = userdata; |
|
3aef9be654ce
Mac: Fix pre-mojave build, cached render image not available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1946
diff
changeset
|
1113 _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
|
1114 [font release]; |
|
3aef9be654ce
Mac: Fix pre-mojave build, cached render image not available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1946
diff
changeset
|
1115 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
|
1116 #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
|
1117 [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
|
1118 [_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
|
1119 #endif |
|
3aef9be654ce
Mac: Fix pre-mojave build, cached render image not available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1946
diff
changeset
|
1120 [super dealloc]; |
|
3aef9be654ce
Mac: Fix pre-mojave build, cached render image not available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1946
diff
changeset
|
1121 } |
|
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
|
1122 -(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
|
1123 @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
|
1124 |
|
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 @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
|
1126 -(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
|
1127 #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
|
1128 -(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
|
1129 { |
|
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 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
|
1131 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
|
1132 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
|
1133 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
|
1134 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
1135 #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
|
1136 -(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
|
1137 { |
|
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 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
|
1139 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
|
1140 { |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1141 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
|
1142 [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
|
1143 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
|
1144 [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
|
1145 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1146 _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
|
1147 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
1148 #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
|
1149 -(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
|
1150 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
1151 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
|
1152 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
|
1153 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
|
1154 } |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
1155 #endif |
|
1985
8d130e45430d
Mac: Rewrite dw_messagebox() to make it thread safe on Mojave.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1984
diff
changeset
|
1156 -(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
|
1157 { |
|
8d130e45430d
Mac: Rewrite dw_messagebox() to make it thread safe on Mojave.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1984
diff
changeset
|
1158 NSInteger iResponse; |
|
8d130e45430d
Mac: Rewrite dw_messagebox() to make it thread safe on Mojave.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1984
diff
changeset
|
1159 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
|
1160 [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
|
1161 [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
|
1162 [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
|
1163 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
|
1164 [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
|
1165 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
|
1166 [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
|
1167 [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
|
1168 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
|
1169 [alert release]; |
|
8d130e45430d
Mac: Rewrite dw_messagebox() to make it thread safe on Mojave.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1984
diff
changeset
|
1170 [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
|
1171 } |
|
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
|
1172 -(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
|
1173 { |
|
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
|
1174 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
|
1175 { |
|
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
|
1176 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
|
1177 |
|
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
|
1178 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
|
1179 { |
|
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
|
1180 IMP imp = [self methodForSelector: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
|
1181 |
|
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
|
1182 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
|
1183 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
|
1184 } |
|
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
|
1185 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
|
1186 [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
|
1187 } |
|
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
|
1188 } |
|
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
|
1189 -(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
|
1190 { |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1191 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
|
1192 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
|
1193 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
|
1194 id bltsrc = bltinfo->src; |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1195 |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1196 #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
|
1197 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
|
1198 { |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1199 DWRender *render = 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
|
1200 |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1201 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
|
1202 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1203 #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
|
1204 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
|
1205 { |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1206 [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
|
1207 [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
|
1208 [[[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
|
1209 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1210 #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
|
1211 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
|
1212 { |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1213 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
|
1214 { |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1215 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
|
1216 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
|
1217 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1218 _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
|
1219 } |
|
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 #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
|
1221 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
|
1222 { |
|
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 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
|
1224 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
|
1225 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
|
1226 NSCompositingOperation op = DWCompositingOperationSourceOver; |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1227 |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1228 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
|
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 IMP iiwc = [image methodForSelector: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
|
1231 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
|
1232 } |
|
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 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
|
1234 { |
|
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 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
|
1236 [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
|
1237 } |
|
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 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
|
1239 { |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1240 [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
|
1241 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
|
1242 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
|
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 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
|
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 [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
|
1247 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
|
1248 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
|
1249 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1250 [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
|
1251 [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
|
1252 } |
|
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 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
|
1254 { |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1255 [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
|
1256 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1257 #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
|
1258 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
|
1259 { |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1260 [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
|
1261 } |
|
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 #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
|
1263 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
|
1264 } |
|
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 -(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
|
1266 { |
|
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
|
1267 #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
|
1268 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
|
1269 DWRender *rend; |
|
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
|
1270 |
|
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
|
1271 while (rend = [enumerator nextObject]) |
|
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
|
1272 rend.needsDisplay = YES; |
|
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
|
1273 [_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
|
1274 #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
|
1275 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
|
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 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
|
1278 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
|
1279 [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
|
1280 _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
|
1281 } |
|
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 #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
|
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 -(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
|
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 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
|
1287 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
|
1288 void (* windowfunc)(void *); |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1289 |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1290 if(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
|
1291 { |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1292 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
|
1293 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
|
1294 { |
|
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 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
|
1296 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1297 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1298 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1299 @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
|
1300 |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
1301 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
|
1302 |
|
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
|
1303 /* 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
|
1304 @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
|
1305 #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
|
1306 <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
|
1307 #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
|
1308 { |
|
2fe7fca61236
Added support for trapping the Mac Quit handler by using DW_DESKTOP as
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1825
diff
changeset
|
1309 } |
|
2fe7fca61236
Added support for trapping the Mac Quit handler by using DW_DESKTOP as
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1825
diff
changeset
|
1310 -(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
|
1311 @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
|
1312 |
|
2fe7fca61236
Added support for trapping the Mac Quit handler by using DW_DESKTOP as
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1825
diff
changeset
|
1313 @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
|
1314 -(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
|
1315 { |
|
2fe7fca61236
Added support for trapping the Mac Quit handler by using DW_DESKTOP as
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1825
diff
changeset
|
1316 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
|
1317 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
|
1318 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
|
1319 } |
|
2fe7fca61236
Added support for trapping the Mac Quit handler by using DW_DESKTOP as
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1825
diff
changeset
|
1320 @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
|
1321 |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1322 /* Subclass for a top-level window */ |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
1323 @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
|
1324 #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
|
1325 <NSWindowDelegate> |
|
d44bb4c4902d
Fixed an error on the close event handler on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
853
diff
changeset
|
1326 #endif |
|
654
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
1327 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1328 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
|
1329 NSSize oldsize; |
|
654
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
1330 } |
|
653
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
1331 -(BOOL)windowShouldClose:(id)sender; |
|
654
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
1332 -(void)setMenu:(NSMenu *)input; |
|
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
1333 -(void)windowDidBecomeMain:(id)sender; |
|
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
1334 -(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
|
1335 -(void)mouseDragged:(NSEvent *)theEvent; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1336 @end |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1337 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1338 @implementation DWView |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
1339 -(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
|
1340 { |
|
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
|
1341 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
|
1342 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
|
1343 return YES; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1344 } |
|
1862
9c7485b1921c
Fixed object/signal/memory leak on Mac when destroying
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1861
diff
changeset
|
1345 -(void)viewDidMoveToWindow |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1346 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1347 [[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
|
1348 [[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
|
1349 } |
|
1862
9c7485b1921c
Fixed object/signal/memory leak on Mac when destroying
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1861
diff
changeset
|
1350 -(void)dealloc |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1351 { |
|
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
|
1352 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
|
1353 { |
|
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
|
1354 [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
|
1355 } |
|
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
|
1356 [[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
|
1357 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
|
1358 [super dealloc]; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1359 } |
|
1862
9c7485b1921c
Fixed object/signal/memory leak on Mac when destroying
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1861
diff
changeset
|
1360 -(void)windowResized:(NSNotification *)notification; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1361 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1362 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
|
1363 |
|
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
|
1364 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
|
1365 { |
|
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
|
1366 _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
|
1367 _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
|
1368 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
|
1369 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
|
1370 _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
|
1371 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1372 } |
|
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
|
1373 -(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
|
1374 { |
|
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
|
1375 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
|
1376 |
|
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
|
1377 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
|
1378 { |
|
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
|
1379 _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
|
1380 _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
|
1381 } |
|
938
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
1382 |
|
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
|
1383 } |
|
654
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
1384 -(void)windowDidBecomeMain:(id)sender |
|
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
1385 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1386 if(windowmenu) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1387 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1388 [DWApp setMainMenu:windowmenu]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1389 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1390 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1391 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1392 [DWApp setMainMenu:DWMainMenu]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1393 } |
|
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
|
1394 _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
|
1395 } |
|
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
|
1396 -(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
|
1397 -(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
|
1398 { |
|
19af25f71e1f
Yet another fix attempt for mene item issues on Mac 10.5.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1590
diff
changeset
|
1399 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
|
1400 |
|
19af25f71e1f
Yet another fix attempt for mene item issues on Mac 10.5.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1590
diff
changeset
|
1401 /* 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
|
1402 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
|
1403 { |
|
19af25f71e1f
Yet another fix attempt for mene item issues on Mac 10.5.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1590
diff
changeset
|
1404 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
|
1405 } |
|
19af25f71e1f
Yet another fix attempt for mene item issues on Mac 10.5.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1590
diff
changeset
|
1406 |
|
19af25f71e1f
Yet another fix attempt for mene item issues on Mac 10.5.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1590
diff
changeset
|
1407 /* 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
|
1408 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
|
1409 [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
|
1410 else |
|
19af25f71e1f
Yet another fix attempt for mene item issues on Mac 10.5.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1590
diff
changeset
|
1411 [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
|
1412 _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
|
1413 } |
|
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
|
1414 -(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
|
1415 -(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
|
1416 { |
|
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
|
1417 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
|
1418 |
|
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
|
1419 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
|
1420 { |
|
abb9203adc05
Use NSCompositeSourceOver for bitblting that respects transparency of the source
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
951
diff
changeset
|
1421 _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
|
1422 } |
|
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
|
1423 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1424 @end |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1425 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1426 /* Subclass for a button type */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1427 @interface DWButton : NSButton |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1428 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1429 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
|
1430 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
|
1431 DWBox *parent; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1432 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1433 -(void *)userdata; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1434 -(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
|
1435 -(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
|
1436 -(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
|
1437 -(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
|
1438 -(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
|
1439 -(DWBox *)parent; |
|
1849
b5e1ccc76e58
Added code to set the foreground color on Mac buttons...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1848
diff
changeset
|
1440 -(NSColor *)textColor; |
|
b5e1ccc76e58
Added code to set the foreground color on Mac buttons...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1848
diff
changeset
|
1441 -(void)setTextColor:(NSColor *)textColor; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1442 @end |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1443 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1444 @implementation DWButton |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1445 -(void *)userdata { return userdata; } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1446 -(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
|
1447 -(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
|
1448 { |
|
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
|
1449 _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
|
1450 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
|
1451 { |
|
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
|
1452 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
|
1453 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
|
1454 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
|
1455 |
|
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
|
1456 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
|
1457 { |
|
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
|
1458 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
|
1459 { |
|
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
|
1460 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
|
1461 |
|
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
|
1462 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
|
1463 { |
|
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
|
1464 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
|
1465 |
|
1936
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
1466 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
|
1467 { |
|
1938
5a88fff43d99
Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1936
diff
changeset
|
1468 [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
|
1469 } |
|
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
|
1470 } |
|
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
|
1471 } |
|
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
|
1472 } |
|
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
|
1473 } |
|
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
|
1474 } |
|
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
|
1475 -(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
|
1476 -(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
|
1477 -(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
|
1478 -(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
|
1479 -(NSColor *)textColor |
|
b5e1ccc76e58
Added code to set the foreground color on Mac buttons...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1848
diff
changeset
|
1480 { |
|
b5e1ccc76e58
Added code to set the foreground color on Mac buttons...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1848
diff
changeset
|
1481 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
|
1482 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
|
1483 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
|
1484 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
|
1485 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
|
1486 if (attrs) { |
|
b5e1ccc76e58
Added code to set the foreground color on Mac buttons...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1848
diff
changeset
|
1487 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
|
1488 } |
|
b5e1ccc76e58
Added code to set the foreground color on Mac buttons...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1848
diff
changeset
|
1489 return textColor; |
|
b5e1ccc76e58
Added code to set the foreground color on Mac buttons...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1848
diff
changeset
|
1490 } |
|
b5e1ccc76e58
Added code to set the foreground color on Mac buttons...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1848
diff
changeset
|
1491 -(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
|
1492 { |
|
b5e1ccc76e58
Added code to set the foreground color on Mac buttons...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1848
diff
changeset
|
1493 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
|
1494 initWithAttributedString:[self attributedTitle]]; |
|
b5e1ccc76e58
Added code to set the foreground color on Mac buttons...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1848
diff
changeset
|
1495 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
|
1496 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
|
1497 [attrTitle addAttribute:NSForegroundColorAttributeName |
|
b5e1ccc76e58
Added code to set the foreground color on Mac buttons...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1848
diff
changeset
|
1498 value:textColor |
|
b5e1ccc76e58
Added code to set the foreground color on Mac buttons...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1848
diff
changeset
|
1499 range:range]; |
|
b5e1ccc76e58
Added code to set the foreground color on Mac buttons...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1848
diff
changeset
|
1500 [attrTitle fixAttributesInRange:range]; |
|
b5e1ccc76e58
Added code to set the foreground color on Mac buttons...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1848
diff
changeset
|
1501 [self setAttributedTitle:attrTitle]; |
|
b5e1ccc76e58
Added code to set the foreground color on Mac buttons...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1848
diff
changeset
|
1502 [attrTitle release]; |
|
b5e1ccc76e58
Added code to set the foreground color on Mac buttons...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1848
diff
changeset
|
1503 } |
|
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
|
1504 -(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
|
1505 { |
|
eecf0eb609d8
Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1805
diff
changeset
|
1506 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
|
1507 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
|
1508 { |
|
1936
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
1509 if(buttonType == DWButtonTypeSwitch) |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
1510 [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
|
1511 else if(buttonType == DWButtonTypeRadio) |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
1512 [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
|
1513 [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
|
1514 } |
|
eecf0eb609d8
Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1805
diff
changeset
|
1515 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
|
1516 { |
|
eecf0eb609d8
Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1805
diff
changeset
|
1517 [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
|
1518 [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
|
1519 } |
|
eecf0eb609d8
Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1805
diff
changeset
|
1520 } |
|
eecf0eb609d8
Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1805
diff
changeset
|
1521 -(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
|
1522 -(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
|
1523 -(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
|
1524 @end |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1525 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1526 /* Subclass for a progress type */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1527 @interface DWPercent : NSProgressIndicator |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1528 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1529 void *userdata; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1530 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1531 -(void *)userdata; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1532 -(void)setUserdata:(void *)input; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1533 @end |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1534 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1535 @implementation DWPercent |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1536 -(void *)userdata { return userdata; } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1537 -(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
|
1538 -(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
|
1539 @end |
|
c5db6c70905c
Added code to remove signal handlers when objects are destroyed on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1306
diff
changeset
|
1540 |
|
c5db6c70905c
Added code to remove signal handlers when objects are destroyed on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1306
diff
changeset
|
1541 /* 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
|
1542 @implementation DWMenuItem |
|
1517
6506f29dfefc
Implement automatic checking and unchecking of menu items on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1513
diff
changeset
|
1543 -(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
|
1544 -(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
|
1545 -(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
|
1546 @end |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
1547 |
|
837
89d4bad9c96e
Initial attempt at implementing the scrollbox on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
831
diff
changeset
|
1548 /* 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
|
1549 @interface DWScrollBox : NSScrollView |
|
89d4bad9c96e
Initial attempt at implementing the scrollbox on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
831
diff
changeset
|
1550 { |
|
89d4bad9c96e
Initial attempt at implementing the scrollbox on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
831
diff
changeset
|
1551 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
|
1552 id box; |
|
837
89d4bad9c96e
Initial attempt at implementing the scrollbox on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
831
diff
changeset
|
1553 } |
|
89d4bad9c96e
Initial attempt at implementing the scrollbox on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
831
diff
changeset
|
1554 -(void *)userdata; |
|
89d4bad9c96e
Initial attempt at implementing the scrollbox on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
831
diff
changeset
|
1555 -(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
|
1556 -(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
|
1557 -(id)box; |
|
837
89d4bad9c96e
Initial attempt at implementing the scrollbox on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
831
diff
changeset
|
1558 @end |
|
89d4bad9c96e
Initial attempt at implementing the scrollbox on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
831
diff
changeset
|
1559 |
|
89d4bad9c96e
Initial attempt at implementing the scrollbox on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
831
diff
changeset
|
1560 @implementation DWScrollBox |
|
89d4bad9c96e
Initial attempt at implementing the scrollbox on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
831
diff
changeset
|
1561 -(void *)userdata { return userdata; } |
|
89d4bad9c96e
Initial attempt at implementing the scrollbox on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
831
diff
changeset
|
1562 -(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
|
1563 -(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
|
1564 -(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
|
1565 -(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
|
1566 @end |
|
89d4bad9c96e
Initial attempt at implementing the scrollbox on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
831
diff
changeset
|
1567 |
|
859
80a88c91ccf6
Implemented vertical centering on text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
858
diff
changeset
|
1568 /* 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
|
1569 @interface DWTextFieldCell : NSTextFieldCell |
|
80a88c91ccf6
Implemented vertical centering on text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
858
diff
changeset
|
1570 { |
|
860
93ac372941c4
Formatting cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
859
diff
changeset
|
1571 BOOL vcenter; |
|
859
80a88c91ccf6
Implemented vertical centering on text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
858
diff
changeset
|
1572 } |
|
80a88c91ccf6
Implemented vertical centering on text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
858
diff
changeset
|
1573 -(NSRect)drawingRectForBounds:(NSRect)theRect; |
|
80a88c91ccf6
Implemented vertical centering on text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
858
diff
changeset
|
1574 -(void)setVCenter:(BOOL)input; |
|
80a88c91ccf6
Implemented vertical centering on text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
858
diff
changeset
|
1575 @end |
|
80a88c91ccf6
Implemented vertical centering on text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
858
diff
changeset
|
1576 |
|
80a88c91ccf6
Implemented vertical centering on text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
858
diff
changeset
|
1577 @implementation DWTextFieldCell |
|
80a88c91ccf6
Implemented vertical centering on text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
858
diff
changeset
|
1578 -(NSRect)drawingRectForBounds:(NSRect)theRect |
|
80a88c91ccf6
Implemented vertical centering on text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
858
diff
changeset
|
1579 { |
|
860
93ac372941c4
Formatting cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
859
diff
changeset
|
1580 /* Get the parent's idea of where we should draw */ |
|
93ac372941c4
Formatting cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
859
diff
changeset
|
1581 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
|
1582 |
|
859
80a88c91ccf6
Implemented vertical centering on text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
858
diff
changeset
|
1583 /* If we are being vertically centered */ |
|
80a88c91ccf6
Implemented vertical centering on text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
858
diff
changeset
|
1584 if(vcenter) |
|
80a88c91ccf6
Implemented vertical centering on text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
858
diff
changeset
|
1585 { |
|
80a88c91ccf6
Implemented vertical centering on text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
858
diff
changeset
|
1586 /* Get our ideal size for current text */ |
|
80a88c91ccf6
Implemented vertical centering on text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
858
diff
changeset
|
1587 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
|
1588 |
|
860
93ac372941c4
Formatting cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
859
diff
changeset
|
1589 /* Center that in the proposed rect */ |
|
93ac372941c4
Formatting cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
859
diff
changeset
|
1590 float heightDelta = newRect.size.height - textSize.height; |
|
93ac372941c4
Formatting cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
859
diff
changeset
|
1591 if (heightDelta > 0) |
|
93ac372941c4
Formatting cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
859
diff
changeset
|
1592 { |
|
93ac372941c4
Formatting cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
859
diff
changeset
|
1593 newRect.size.height -= heightDelta; |
|
93ac372941c4
Formatting cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
859
diff
changeset
|
1594 newRect.origin.y += (heightDelta / 2); |
|
93ac372941c4
Formatting cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
859
diff
changeset
|
1595 } |
|
93ac372941c4
Formatting cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
859
diff
changeset
|
1596 } |
|
859
80a88c91ccf6
Implemented vertical centering on text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
858
diff
changeset
|
1597 |
|
860
93ac372941c4
Formatting cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
859
diff
changeset
|
1598 return newRect; |
|
859
80a88c91ccf6
Implemented vertical centering on text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
858
diff
changeset
|
1599 } |
|
80a88c91ccf6
Implemented vertical centering on text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
858
diff
changeset
|
1600 -(void)setVCenter:(BOOL)input { vcenter = input; } |
|
80a88c91ccf6
Implemented vertical centering on text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
858
diff
changeset
|
1601 @end |
|
80a88c91ccf6
Implemented vertical centering on text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
858
diff
changeset
|
1602 |
|
938
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
1603 @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
|
1604 { |
|
29d8ae25a78c
Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
886
diff
changeset
|
1605 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
|
1606 } |
|
29d8ae25a78c
Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
886
diff
changeset
|
1607 - (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
|
1608 - (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
|
1609 @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
|
1610 |
|
938
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
1611 /* 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
|
1612 * 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
|
1613 */ |
|
29d8ae25a78c
Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
886
diff
changeset
|
1614 @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
|
1615 -(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
|
1616 { |
|
1063
2ebaea72ac95
Fix for some release calls causing issues on MacOS 10.7 Lion.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1061
diff
changeset
|
1617 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
|
1618 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
|
1619 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
|
1620 } |
|
29d8ae25a78c
Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
886
diff
changeset
|
1621 -(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
|
1622 -(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
|
1623 -(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
|
1624 -(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
|
1625 -(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
|
1626 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
|
1627 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
|
1628 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
|
1629 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
|
1630 { |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
1631 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
|
1632 { |
|
29d8ae25a78c
Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
886
diff
changeset
|
1633 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
|
1634 } |
|
29d8ae25a78c
Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
886
diff
changeset
|
1635 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
|
1636 } |
|
29d8ae25a78c
Implemented dw_entryfield_set_limit() on the Mac using a custom formatter class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
886
diff
changeset
|
1637 -(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
|
1638 @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
|
1639 |
|
651
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
1640 /* Subclass for a entryfield type */ |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
1641 @interface DWEntryField : NSTextField |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
1642 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1643 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
|
1644 id clickDefault; |
|
651
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
1645 } |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
1646 -(void *)userdata; |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
1647 -(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
|
1648 -(void)setClickDefault:(id)input; |
|
651
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
1649 @end |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
1650 |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
1651 @implementation DWEntryField |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
1652 -(void *)userdata { return userdata; } |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
1653 -(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
|
1654 -(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
|
1655 -(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
|
1656 { |
|
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
|
1657 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
|
1658 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
|
1659 { |
|
1236
46de4dbe710d
Fixed clickdefault not triggering event for buttons on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1235
diff
changeset
|
1660 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
|
1661 [clickDefault buttonClicked:self]; |
|
46de4dbe710d
Fixed clickdefault not triggering event for buttons on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1235
diff
changeset
|
1662 else |
|
46de4dbe710d
Fixed clickdefault not triggering event for buttons on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1235
diff
changeset
|
1663 [[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
|
1664 } else |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
1665 { |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
1666 [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
|
1667 } |
|
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
|
1668 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
1669 -(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
|
1670 { |
|
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
|
1671 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
|
1672 { |
|
9327f684c9b8
Attempt at fixing Copy, Cut, Paste, Select All Mac key combos...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1234
diff
changeset
|
1673 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
|
1674 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
|
1675 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
|
1676 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
|
1677 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
|
1678 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
|
1679 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
|
1680 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
|
1681 } |
|
9327f684c9b8
Attempt at fixing Copy, Cut, Paste, Select All Mac key combos...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1234
diff
changeset
|
1682 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
|
1683 } |
|
1312
c5db6c70905c
Added code to remove signal handlers when objects are destroyed on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1306
diff
changeset
|
1684 -(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
|
1685 @end |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
1686 |
|
1564
d84a690448c3
Attempted fix at border calculation on Mac for status text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1559
diff
changeset
|
1687 /* 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
|
1688 @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
|
1689 { |
|
d84a690448c3
Attempted fix at border calculation on Mac for status text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1559
diff
changeset
|
1690 void *userdata; |
|
d84a690448c3
Attempted fix at border calculation on Mac for status text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1559
diff
changeset
|
1691 id clickDefault; |
|
d84a690448c3
Attempted fix at border calculation on Mac for status text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1559
diff
changeset
|
1692 } |
|
d84a690448c3
Attempted fix at border calculation on Mac for status text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1559
diff
changeset
|
1693 -(void *)userdata; |
|
d84a690448c3
Attempted fix at border calculation on Mac for status text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1559
diff
changeset
|
1694 -(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
|
1695 @end |
|
d84a690448c3
Attempted fix at border calculation on Mac for status text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1559
diff
changeset
|
1696 |
|
d84a690448c3
Attempted fix at border calculation on Mac for status text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1559
diff
changeset
|
1697 @implementation DWText |
|
d84a690448c3
Attempted fix at border calculation on Mac for status text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1559
diff
changeset
|
1698 -(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
|
1699 -(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
|
1700 -(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
|
1701 @end |
|
d84a690448c3
Attempted fix at border calculation on Mac for status text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1559
diff
changeset
|
1702 |
|
d84a690448c3
Attempted fix at border calculation on Mac for status text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1559
diff
changeset
|
1703 |
|
651
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
1704 /* Subclass for a entryfield password type */ |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
1705 @interface DWEntryFieldPassword : NSSecureTextField |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
1706 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1707 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
|
1708 id clickDefault; |
|
651
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
1709 } |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
1710 -(void *)userdata; |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
1711 -(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
|
1712 -(void)setClickDefault:(id)input; |
|
651
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
1713 @end |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
1714 |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
1715 @implementation DWEntryFieldPassword |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
1716 -(void *)userdata { return userdata; } |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
1717 -(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
|
1718 -(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
|
1719 -(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
|
1720 { |
|
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
|
1721 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
|
1722 { |
|
1236
46de4dbe710d
Fixed clickdefault not triggering event for buttons on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1235
diff
changeset
|
1723 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
|
1724 [clickDefault buttonClicked:self]; |
|
46de4dbe710d
Fixed clickdefault not triggering event for buttons on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1235
diff
changeset
|
1725 else |
|
46de4dbe710d
Fixed clickdefault not triggering event for buttons on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1235
diff
changeset
|
1726 [[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
|
1727 } |
|
9327f684c9b8
Attempt at fixing Copy, Cut, Paste, Select All Mac key combos...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1234
diff
changeset
|
1728 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
|
1729 { |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
1730 [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
|
1731 } |
|
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
|
1732 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
1733 -(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
|
1734 { |
|
1983
59146d14e21e
Mac: Fix building for MacOS 10.10 Yosemite.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1974
diff
changeset
|
1735 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
|
1736 { |
|
9327f684c9b8
Attempt at fixing Copy, Cut, Paste, Select All Mac key combos...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1234
diff
changeset
|
1737 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
|
1738 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
|
1739 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
|
1740 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
|
1741 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
|
1742 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
|
1743 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
|
1744 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
|
1745 } |
|
9327f684c9b8
Attempt at fixing Copy, Cut, Paste, Select All Mac key combos...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1234
diff
changeset
|
1746 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
|
1747 } |
|
1312
c5db6c70905c
Added code to remove signal handlers when objects are destroyed on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1306
diff
changeset
|
1748 -(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
|
1749 @end |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
1750 |
|
652
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
1751 /* Subclass for a Notebook control type */ |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
1752 @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
|
1753 #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
|
1754 <NSTabViewDelegate> |
|
17923b931393
Fixes for building for MacOS 10.5 and PPC
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
715
diff
changeset
|
1755 #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
|
1756 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1757 void *userdata; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1758 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
|
1759 } |
|
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
1760 -(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
|
1761 -(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
|
1762 -(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
|
1763 -(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
|
1764 -(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
|
1765 @end |
|
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
1766 |
|
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
1767 /* 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
|
1768 @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
|
1769 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1770 void *userdata; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1771 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
|
1772 } |
|
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
1773 -(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
|
1774 -(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
|
1775 -(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
|
1776 -(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
|
1777 @end |
|
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
1778 |
|
703
329736825f9b
Implemented more of the missing event/signal handlers and other code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
702
diff
changeset
|
1779 @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
|
1780 -(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
|
1781 -(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
|
1782 -(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
|
1783 -(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
|
1784 -(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
|
1785 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1786 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
|
1787 DWNotebookPage *page = (DWNotebookPage *)notepage; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
1788 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1789 if([object isMemberOfClass:[DWBox class]]) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1790 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1791 DWBox *view = object; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1792 Box *box = [view box]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1793 NSSize size = [view frame].size; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1794 _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
|
1795 _handle_resize_events(box); |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1796 } |
|
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
|
1797 _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
|
1798 } |
|
1808
f3458cd6277c
Added keyboard support to the notebook control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1807
diff
changeset
|
1799 -(void)keyDown:(NSEvent *)theEvent |
|
f3458cd6277c
Added keyboard support to the notebook control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1807
diff
changeset
|
1800 { |
|
f3458cd6277c
Added keyboard support to the notebook control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1807
diff
changeset
|
1801 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
|
1802 |
|
1809
5efaea897310
Fixed back tab handling for certain controls on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1808
diff
changeset
|
1803 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
|
1804 [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
|
1805 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
|
1806 { |
|
f3458cd6277c
Added keyboard support to the notebook control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1807
diff
changeset
|
1807 NSArray *pages = [self tabViewItems]; |
|
f3458cd6277c
Added keyboard support to the notebook control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1807
diff
changeset
|
1808 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
|
1809 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
|
1810 |
|
1808
f3458cd6277c
Added keyboard support to the notebook control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1807
diff
changeset
|
1811 if(index != NSNotFound) |
|
f3458cd6277c
Added keyboard support to the notebook control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1807
diff
changeset
|
1812 { |
|
f3458cd6277c
Added keyboard support to the notebook control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1807
diff
changeset
|
1813 if(index > 0) |
|
f3458cd6277c
Added keyboard support to the notebook control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1807
diff
changeset
|
1814 [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
|
1815 else |
|
f3458cd6277c
Added keyboard support to the notebook control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1807
diff
changeset
|
1816 [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
|
1817 |
|
1808
f3458cd6277c
Added keyboard support to the notebook control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1807
diff
changeset
|
1818 } |
|
f3458cd6277c
Added keyboard support to the notebook control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1807
diff
changeset
|
1819 } |
|
1809
5efaea897310
Fixed back tab handling for certain controls on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1808
diff
changeset
|
1820 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
|
1821 { |
|
f3458cd6277c
Added keyboard support to the notebook control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1807
diff
changeset
|
1822 NSArray *pages = [self tabViewItems]; |
|
f3458cd6277c
Added keyboard support to the notebook control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1807
diff
changeset
|
1823 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
|
1824 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
|
1825 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
|
1826 |
|
1808
f3458cd6277c
Added keyboard support to the notebook control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1807
diff
changeset
|
1827 if(index != NSNotFound) |
|
f3458cd6277c
Added keyboard support to the notebook control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1807
diff
changeset
|
1828 { |
|
f3458cd6277c
Added keyboard support to the notebook control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1807
diff
changeset
|
1829 if(index + 1 < count) |
|
f3458cd6277c
Added keyboard support to the notebook control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1807
diff
changeset
|
1830 [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
|
1831 else |
|
f3458cd6277c
Added keyboard support to the notebook control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1807
diff
changeset
|
1832 [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
|
1833 |
|
1808
f3458cd6277c
Added keyboard support to the notebook control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1807
diff
changeset
|
1834 } |
|
f3458cd6277c
Added keyboard support to the notebook control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1807
diff
changeset
|
1835 } |
|
f3458cd6277c
Added keyboard support to the notebook control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1807
diff
changeset
|
1836 [super keyDown:theEvent]; |
|
f3458cd6277c
Added keyboard support to the notebook control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1807
diff
changeset
|
1837 } |
|
f3458cd6277c
Added keyboard support to the notebook control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1807
diff
changeset
|
1838 -(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
|
1839 -(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
|
1840 -(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
|
1841 @end |
|
329736825f9b
Implemented more of the missing event/signal handlers and other code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
702
diff
changeset
|
1842 |
|
652
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
1843 @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
|
1844 -(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
|
1845 -(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
|
1846 -(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
|
1847 -(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
|
1848 -(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
|
1849 @end |
|
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
1850 |
|
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
1851 /* Subclass for a color chooser type */ |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
1852 @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
|
1853 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1854 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
|
1855 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
|
1856 } |
|
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
1857 -(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
|
1858 -(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
|
1859 -(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
|
1860 @end |
|
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
1861 |
|
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
1862 @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
|
1863 -(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
|
1864 { |
|
1644
2b55465887e1
Color chooser changes for Lion compatibility on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1610
diff
changeset
|
1865 if(!dialog) |
|
2b55465887e1
Color chooser changes for Lion compatibility on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1610
diff
changeset
|
1866 [self close]; |
|
2b55465887e1
Color chooser changes for Lion compatibility on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1610
diff
changeset
|
1867 else |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
1868 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
|
1869 } |
|
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
1870 -(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
|
1871 { |
|
1644
2b55465887e1
Color chooser changes for Lion compatibility on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1610
diff
changeset
|
1872 if(dialog) |
|
2b55465887e1
Color chooser changes for Lion compatibility on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1610
diff
changeset
|
1873 { |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
1874 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
|
1875 dialog = nil; |
|
1644
2b55465887e1
Color chooser changes for Lion compatibility on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1610
diff
changeset
|
1876 dw_dialog_dismiss(d, pickedcolor); |
|
2b55465887e1
Color chooser changes for Lion compatibility on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1610
diff
changeset
|
1877 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
1878 [self close]; |
|
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
1879 return NO; |
|
1644
2b55465887e1
Color chooser changes for Lion compatibility on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1610
diff
changeset
|
1880 } |
|
652
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)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
|
1882 -(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
|
1883 @end |
|
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
1884 |
|
1050
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
1885 /* 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
|
1886 @interface DWFontChoose : NSFontPanel |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
1887 { |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
1888 DWDialog *dialog; |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
1889 NSFontManager *fontManager; |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
1890 } |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
1891 -(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
|
1892 -(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
|
1893 -(DWDialog *)dialog; |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
1894 @end |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
1895 |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
1896 @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
|
1897 -(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
|
1898 { |
|
1050
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
1899 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
|
1900 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
|
1901 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
|
1902 [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
|
1903 return NO; |
|
1050
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
1904 } |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
1905 -(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
|
1906 -(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
|
1907 -(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
|
1908 @end |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
1909 |
|
652
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
1910 /* Subclass for a splitbar type */ |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
1911 @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
|
1912 #ifdef BUILDING_FOR_SNOW_LEOPARD |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
1913 <NSSplitViewDelegate> |
|
717
17923b931393
Fixes for building for MacOS 10.5 and PPC
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
715
diff
changeset
|
1914 #endif |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
1915 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1916 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
|
1917 float percent; |
|
1956
2924bc788170
Mac: Added code to avoid unused variable/parameter warnings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1955
diff
changeset
|
1918 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
|
1919 } |
|
99002595f549
Fixes for dw_splitbar_set() not working on an unsized window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
676
diff
changeset
|
1920 -(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
|
1921 -(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
|
1922 -(void *)userdata; |
|
99002595f549
Fixes for dw_splitbar_set() not working on an unsized window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
676
diff
changeset
|
1923 -(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
|
1924 -(float)percent; |
|
99002595f549
Fixes for dw_splitbar_set() not working on an unsized window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
676
diff
changeset
|
1925 -(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
|
1926 @end |
|
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
1927 |
|
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
1928 @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
|
1929 -(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
|
1930 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1931 NSArray *views = [self subviews]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1932 id object; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
1933 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1934 for(object in views) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1935 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1936 if([object isMemberOfClass:[DWBox class]]) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1937 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1938 DWBox *view = object; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1939 Box *box = [view box]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1940 NSSize size = [view frame].size; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1941 _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
|
1942 _handle_resize_events(box); |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1943 } |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
1944 } |
|
652
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
1945 } |
|
1957
c15af2f757e2
Mac: Initial code to support Dark Mode on Mojave.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1956
diff
changeset
|
1946 -(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
|
1947 -(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
|
1948 -(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
|
1949 -(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
|
1950 -(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
|
1951 -(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
|
1952 @end |
|
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
1953 |
|
653
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
1954 /* 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
|
1955 @interface DWSlider : NSSlider |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
1956 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1957 void *userdata; |
|
653
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
1958 } |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
1959 -(void *)userdata; |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
1960 -(void)setUserdata:(void *)input; |
|
704
336800e9e648
Fixes to the slider control so events happen.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
703
diff
changeset
|
1961 -(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
|
1962 @end |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
1963 |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
1964 @implementation DWSlider |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
1965 -(void *)userdata { return userdata; } |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
1966 -(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
|
1967 -(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
|
1968 -(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
|
1969 @end |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
1970 |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
1971 /* 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
|
1972 @interface DWScrollbar : NSScroller |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
1973 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
1974 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
|
1975 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
|
1976 double visible; |
|
1419
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
1977 int vertical; |
|
653
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
1978 } |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
1979 -(void *)userdata; |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
1980 -(void)setUserdata:(void *)input; |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
1981 -(float)range; |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
1982 -(float)visible; |
|
1419
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
1983 -(int)vertical; |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
1984 -(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
|
1985 -(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
|
1986 -(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
|
1987 @end |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
1988 |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
1989 @implementation DWScrollbar |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
1990 -(void *)userdata { return userdata; } |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
1991 -(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
|
1992 -(float)range { return range; } |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
1993 -(float)visible { return visible; } |
|
1419
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
1994 -(int)vertical { return vertical; } |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
1995 -(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
|
1996 -(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
|
1997 -(void)scrollerChanged:(id)sender |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
1998 { |
|
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
|
1999 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
|
2000 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
|
2001 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
|
2002 |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2003 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
|
2004 { |
|
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
|
2005 #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
|
2006 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
|
2007 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
|
2008 { |
|
86d76fc09237
Added support for scrollbar line and page scrolling. Need to check the calculations...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
706
diff
changeset
|
2009 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
|
2010 } |
|
86d76fc09237
Added support for scrollbar line and page scrolling. Need to check the calculations...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
706
diff
changeset
|
2011 break; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2012 |
|
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
|
2013 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
|
2014 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
|
2015 { |
|
86d76fc09237
Added support for scrollbar line and page scrolling. Need to check the calculations...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
706
diff
changeset
|
2016 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
|
2017 } |
|
86d76fc09237
Added support for scrollbar line and page scrolling. Need to check the calculations...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
706
diff
changeset
|
2018 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
|
2019 #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
|
2020 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
|
2021 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
|
2022 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
|
2023 { |
|
86d76fc09237
Added support for scrollbar line and page scrolling. Need to check the calculations...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
706
diff
changeset
|
2024 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
|
2025 } |
|
86d76fc09237
Added support for scrollbar line and page scrolling. Need to check the calculations...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
706
diff
changeset
|
2026 break; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2027 |
|
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
|
2028 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
|
2029 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
|
2030 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
|
2031 { |
|
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
|
2032 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
|
2033 } |
|
86d76fc09237
Added support for scrollbar line and page scrolling. Need to check the calculations...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
706
diff
changeset
|
2034 break; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2035 |
|
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
|
2036 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
|
2037 ; /* 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
|
2038 } |
|
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
|
2039 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
|
2040 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
|
2041 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
|
2042 { |
|
923
0ac67b62b594
Fix int to double conversion issues causing scrollbar issues on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
922
diff
changeset
|
2043 [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
|
2044 } |
|
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
|
2045 _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
|
2046 } |
|
1312
c5db6c70905c
Added code to remove signal handlers when objects are destroyed on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1306
diff
changeset
|
2047 -(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
|
2048 @end |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
2049 |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
2050 /* Subclass for a MLE type */ |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2051 @interface DWMLE : NSTextView |
|
653
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
2052 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2053 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
|
2054 id scrollview; |
|
653
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
2055 } |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
2056 -(void *)userdata; |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
2057 -(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
|
2058 -(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
|
2059 -(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
|
2060 @end |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
2061 |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
2062 @implementation DWMLE |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
2063 -(void *)userdata { return userdata; } |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
2064 -(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
|
2065 -(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
|
2066 -(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
|
2067 -(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
|
2068 @end |
|
36c6669422d2
Continuing to add types... looking to almost be usable. :)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
652
diff
changeset
|
2069 |
|
1206
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2070 /* 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
|
2071 @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
|
2072 { |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2073 @private |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2074 NSImage *image; |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2075 } |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2076 -(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
|
2077 -(NSImage *)image; |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2078 -(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
|
2079 -(NSSize)cellSize; |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2080 @end |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2081 |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2082 @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
|
2083 -(void)dealloc |
|
1206
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2084 { |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2085 [image release]; |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2086 image = nil; |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2087 [super dealloc]; |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2088 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
2089 -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
|
2090 { |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2091 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
|
2092 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
|
2093 return cell; |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2094 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
2095 -(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
|
2096 { |
|
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
2097 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
|
2098 { |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2099 [image release]; |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2100 image = [anImage retain]; |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2101 } |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2102 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
2103 -(NSImage *)image |
|
1206
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2104 { |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2105 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
|
2106 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
2107 -(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
|
2108 { |
|
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
2109 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
|
2110 { |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2111 NSRect imageFrame; |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2112 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
|
2113 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
|
2114 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
|
2115 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
|
2116 return imageFrame; |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2117 } |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2118 else |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2119 return NSZeroRect; |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2120 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
2121 -(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
|
2122 { |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2123 NSRect textFrame, imageFrame; |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2124 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
|
2125 [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
|
2126 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
2127 -(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
|
2128 { |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2129 NSRect textFrame, imageFrame; |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2130 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
|
2131 [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
|
2132 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
2133 -(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
|
2134 { |
|
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
2135 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
|
2136 { |
|
1206
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2137 NSSize imageSize; |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2138 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
|
2139 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
|
2140 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
|
2141 |
|
1206
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2142 imageSize = [image size]; |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2143 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
|
2144 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
|
2145 { |
|
1206
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2146 [[self backgroundColor] set]; |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2147 NSRectFill(imageFrame); |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2148 } |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2149 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
|
2150 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
|
2151 |
|
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
|
2152 /* 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
|
2153 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
|
2154 { |
|
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
|
2155 IMP idir = [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
|
2156 |
|
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
|
2157 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
|
2158 |
|
1914
3872ab37297b
Fix numerous deprecation warnings building with SDK 10.12 Sierra.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1908
diff
changeset
|
2159 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
|
2160 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
2161 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
|
2162 { |
|
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
|
2163 /* 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
|
2164 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
|
2165 |
|
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
2166 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
|
2167 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
|
2168 else |
|
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
2169 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
|
2170 |
|
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
|
2171 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
|
2172 { |
|
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
|
2173 IMP ictp = [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
|
2174 |
|
1914
3872ab37297b
Fix numerous deprecation warnings building with SDK 10.12 Sierra.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1908
diff
changeset
|
2175 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
|
2176 } |
|
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
|
2177 } |
|
1206
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2178 } |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2179 [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
|
2180 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
2181 -(NSSize)cellSize |
|
1206
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2182 { |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2183 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
|
2184 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
|
2185 return cellSize; |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2186 } |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2187 @end |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2188 |
|
655
27eb39d2577b
Calendar and HTML functions filled in.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
654
diff
changeset
|
2189 /* Subclass for a Container/List type */ |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2190 @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
|
2191 #ifdef BUILDING_FOR_SNOW_LEOPARD |
|
813
7fa26d8cc8d0
Fix for column click handler not working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
812
diff
changeset
|
2192 <NSTableViewDataSource,NSTableViewDelegate> |
|
717
17923b931393
Fixes for building for MacOS 10.5 and PPC
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
715
diff
changeset
|
2193 #endif |
|
654
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
2194 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2195 void *userdata; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2196 NSMutableArray *tvcols; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2197 NSMutableArray *data; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2198 NSMutableArray *types; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2199 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
|
2200 NSPointerArray *rowdatas; |
|
1206
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2201 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
|
2202 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
|
2203 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
|
2204 int lastAddPoint, lastQueryPoint; |
|
668
7b99731c6484
Fixes for splitbars (horizontal and vertical definitions are reversed).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
667
diff
changeset
|
2205 id scrollview; |
|
813
7fa26d8cc8d0
Fix for column click handler not working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
812
diff
changeset
|
2206 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
|
2207 } |
|
0502e5b6743b
Haven't finished but the basics of the container/listbox are now working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
657
diff
changeset
|
2208 -(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
|
2209 -(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
|
2210 -(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
|
2211 -(void *)userdata; |
|
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
2212 -(void)setUserdata:(void *)input; |
|
813
7fa26d8cc8d0
Fix for column click handler not working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
812
diff
changeset
|
2213 -(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
|
2214 -(int)filesystem; |
|
668
7b99731c6484
Fixes for splitbars (horizontal and vertical definitions are reversed).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
667
diff
changeset
|
2215 -(id)scrollview; |
|
7b99731c6484
Fixes for splitbars (horizontal and vertical definitions are reversed).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
667
diff
changeset
|
2216 -(void)setScrollview:(id)input; |
|
657
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
2217 -(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
|
2218 -(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
|
2219 -(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
|
2220 -(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
|
2221 -(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
|
2222 -(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
|
2223 -(void)removeRow:(int)row; |
|
659
756015085da7
Fixes for container signal handling.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
658
diff
changeset
|
2224 -(void)setRow:(int)row title:(void *)input; |
|
756015085da7
Fixes for container signal handling.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
658
diff
changeset
|
2225 -(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
|
2226 -(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
|
2227 -(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
|
2228 -(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
|
2229 -(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
|
2230 -(void)setLastQueryPoint:(int)input; |
|
657
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
2231 -(void)clear; |
|
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
2232 -(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
|
2233 -(void)optimize; |
|
1573
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2234 -(NSSize)getsize; |
|
810
746cdd753e7a
Added coloring support for the Container/Tree/Listbox controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
809
diff
changeset
|
2235 -(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
|
2236 -(void)doubleClicked:(id)sender; |
|
829
f7b6c88bac47
Implemented Enter/Return triggering the item enter event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
828
diff
changeset
|
2237 -(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
|
2238 -(void)tableView:(NSTableView *)tableView didClickTableColumn:(NSTableColumn *)tableColumn; |
|
659
756015085da7
Fixes for container signal handling.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
658
diff
changeset
|
2239 -(void)selectionChanged:(id)sender; |
|
756015085da7
Fixes for container signal handling.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
658
diff
changeset
|
2240 -(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
|
2241 #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
|
2242 -(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
|
2243 #endif |
|
654
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
2244 @end |
|
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
2245 |
|
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
2246 @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
|
2247 -(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
|
2248 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2249 if(tvcols && data) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2250 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2251 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
|
2252 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
|
2253 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
|
2254 { |
|
41a93f9896e3
Avoid an array out of bounds after container clear on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1133
diff
changeset
|
2255 return total / cols; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2256 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2257 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2258 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
|
2259 } |
|
0502e5b6743b
Haven't finished but the basics of the container/listbox are now working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
657
diff
changeset
|
2260 -(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
|
2261 { |
|
1134
41a93f9896e3
Avoid an array out of bounds after container clear on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1133
diff
changeset
|
2262 if(tvcols && data) |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2263 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2264 int z, col = -1; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2265 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
|
2266 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2267 for(z=0;z<count;z++) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2268 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2269 if([tvcols objectAtIndex:z] == aCol) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2270 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2271 col = z; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2272 break; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2273 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2274 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2275 if(col != -1) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2276 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2277 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
|
2278 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
|
2279 { |
|
41a93f9896e3
Avoid an array out of bounds after container clear on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1133
diff
changeset
|
2280 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
|
2281 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
|
2282 } |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2283 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2284 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2285 return nil; |
|
657
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
2286 } |
|
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
|
2287 #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
|
2288 -(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
|
2289 { |
|
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
|
2290 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
|
2291 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
|
2292 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
|
2293 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
|
2294 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
|
2295 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
|
2296 } |
|
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
|
2297 #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
|
2298 -(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
|
2299 -(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
|
2300 -(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
|
2301 -(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
|
2302 -(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
|
2303 -(id)scrollview { return scrollview; } |
|
17923b931393
Fixes for building for MacOS 10.5 and PPC
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
715
diff
changeset
|
2304 -(void)setScrollview:(id)input { scrollview = input; } |
|
657
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
2305 -(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
|
2306 -(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
|
2307 -(void)refreshColors |
|
1206
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2308 { |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2309 NSColor *oldodd = oddcolor; |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2310 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
|
2311 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
|
2312 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
|
2313 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
|
2314 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
|
2315 |
|
1206
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2316 /* 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
|
2317 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
|
2318 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
|
2319 else |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2320 oddcolor = NULL; |
|
1958
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
2321 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
|
2322 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
|
2323 else |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2324 evencolor = NULL; |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2325 [oldodd release]; |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2326 [oldeven release]; |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2327 } |
|
1958
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
2328 -(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
|
2329 { |
|
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
2330 /* 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
|
2331 dw_oddcolor = oddcol; |
|
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
2332 dw_evencolor = evencol; |
|
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
2333 [self refreshColors]; |
|
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
2334 } |
|
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
2335 -(void)checkDark |
|
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
2336 { |
|
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
2337 /* 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
|
2338 _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
|
2339 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
|
2340 _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
|
2341 else |
|
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
2342 _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
|
2343 /* 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
|
2344 if(titles) |
|
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
2345 [self refreshColors]; |
|
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
2346 } |
|
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
2347 -(void)viewDidChangeEffectiveAppearance { [self checkDark]; } |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2348 -(int)insertRow:(NSArray *)input at:(int)index |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2349 { |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2350 if(data) |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2351 { |
|
687
5dde8d34bc69
Implemented dw_listbox_insert for containers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
686
diff
changeset
|
2352 unsigned long start = [tvcols count] * index; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2353 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
|
2354 if(index < lastAddPoint) |
|
5dde8d34bc69
Implemented dw_listbox_insert for containers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
686
diff
changeset
|
2355 { |
|
5dde8d34bc69
Implemented dw_listbox_insert for containers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
686
diff
changeset
|
2356 lastAddPoint++; |
|
5dde8d34bc69
Implemented dw_listbox_insert for containers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
686
diff
changeset
|
2357 } |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2358 [data insertObjects:input atIndexes:set]; |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2359 [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
|
2360 [rowdatas insertPointer:NULL atIndex:index]; |
|
687
5dde8d34bc69
Implemented dw_listbox_insert for containers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
686
diff
changeset
|
2361 [set release]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2362 return (int)[titles count]; |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2363 } |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2364 return 0; |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2365 } |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2366 -(int)addRow:(NSArray *)input |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2367 { |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2368 if(data) |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2369 { |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2370 lastAddPoint = (int)[titles count]; |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2371 [data addObjectsFromArray:input]; |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2372 [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
|
2373 [rowdatas addPointer:NULL]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2374 return (int)[titles count]; |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2375 } |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2376 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
|
2377 } |
|
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
|
2378 -(int)addRows:(int)number |
|
657
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
2379 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2380 if(tvcols) |
|
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 int count = (int)(number * [tvcols count]); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2383 int z; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
2384 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2385 lastAddPoint = (int)[titles count]; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
2386 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2387 for(z=0;z<count;z++) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2388 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2389 [data addObject:[NSNull null]]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2390 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2391 for(z=0;z<number;z++) |
|
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 [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
|
2394 [rowdatas addPointer:NULL]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2395 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2396 return (int)[titles count]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2397 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2398 return 0; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
2399 } |
|
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
|
2400 -(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
|
2401 { |
|
1206
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2402 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
|
2403 |
|
1206
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2404 /* 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
|
2405 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
|
2406 { |
|
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
|
2407 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
|
2408 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
|
2409 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
|
2410 [bcell setImage:img]; |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2411 } |
|
1215
dc8ea09605f7
Can't set the background on Image cells apparently on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1212
diff
changeset
|
2412 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
|
2413 { |
|
dc8ea09605f7
Can't set the background on Image cells apparently on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1212
diff
changeset
|
2414 /* 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
|
2415 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
|
2416 { |
|
dc8ea09605f7
Can't set the background on Image cells apparently on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1212
diff
changeset
|
2417 if(evencolor) |
|
dc8ea09605f7
Can't set the background on Image cells apparently on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1212
diff
changeset
|
2418 { |
|
dc8ea09605f7
Can't set the background on Image cells apparently on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1212
diff
changeset
|
2419 [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
|
2420 [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
|
2421 } |
|
dc8ea09605f7
Can't set the background on Image cells apparently on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1212
diff
changeset
|
2422 else |
|
dc8ea09605f7
Can't set the background on Image cells apparently on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1212
diff
changeset
|
2423 [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
|
2424 } |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2425 else |
|
1215
dc8ea09605f7
Can't set the background on Image cells apparently on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1212
diff
changeset
|
2426 { |
|
dc8ea09605f7
Can't set the background on Image cells apparently on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1212
diff
changeset
|
2427 if(oddcolor) |
|
dc8ea09605f7
Can't set the background on Image cells apparently on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1212
diff
changeset
|
2428 { |
|
dc8ea09605f7
Can't set the background on Image cells apparently on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1212
diff
changeset
|
2429 [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
|
2430 [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
|
2431 } |
|
dc8ea09605f7
Can't set the background on Image cells apparently on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1212
diff
changeset
|
2432 else |
|
dc8ea09605f7
Can't set the background on Image cells apparently on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1212
diff
changeset
|
2433 [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
|
2434 } |
|
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
|
2435 } |
|
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
|
2436 } |
|
657
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
2437 -(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
|
2438 { |
|
1288
d10969835d2d
Changes to allow removing icon on BITMAPORICON container columns on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1279
diff
changeset
|
2439 if(tvcols) |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2440 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2441 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
|
2442 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
|
2443 { |
|
1288
d10969835d2d
Changes to allow removing icon on BITMAPORICON container columns on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1279
diff
changeset
|
2444 if(!input) |
|
d10969835d2d
Changes to allow removing icon on BITMAPORICON container columns on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1279
diff
changeset
|
2445 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
|
2446 [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
|
2447 } |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2448 } |
|
657
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
2449 } |
|
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
|
2450 -(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
|
2451 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2452 if(tvcols) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2453 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2454 int z, start, end; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2455 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
|
2456 void *oldtitle; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
2457 |
|
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
|
2458 start = (count * row); |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2459 end = start + count; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
2460 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2461 for(z=start;z<end;z++) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2462 { |
|
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
|
2463 [data removeObjectAtIndex:start]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2464 } |
|
1874
71c8a45b2a35
Fixes for Mac code and allocate and free duplicates of title strings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1871
diff
changeset
|
2465 oldtitle = [titles pointerAtIndex:row]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2466 [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
|
2467 [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
|
2468 if(lastAddPoint > 0 && lastAddPoint > row) |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2469 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2470 lastAddPoint--; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2471 } |
|
1874
71c8a45b2a35
Fixes for Mac code and allocate and free duplicates of title strings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1871
diff
changeset
|
2472 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
|
2473 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
|
2474 } |
|
71c8a45b2a35
Fixes for Mac code and allocate and free duplicates of title strings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1871
diff
changeset
|
2475 } |
|
71c8a45b2a35
Fixes for Mac code and allocate and free duplicates of title strings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1871
diff
changeset
|
2476 -(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
|
2477 { |
|
71c8a45b2a35
Fixes for Mac code and allocate and free duplicates of title strings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1871
diff
changeset
|
2478 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
|
2479 { |
|
71c8a45b2a35
Fixes for Mac code and allocate and free duplicates of title strings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1871
diff
changeset
|
2480 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
|
2481 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
|
2482 [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
|
2483 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
|
2484 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
|
2485 } |
|
71c8a45b2a35
Fixes for Mac code and allocate and free duplicates of title strings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1871
diff
changeset
|
2486 } |
|
1871
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
2487 -(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
|
2488 -(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
|
2489 -(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
|
2490 -(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
|
2491 -(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
|
2492 -(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
|
2493 -(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
|
2494 -(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
|
2495 -(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
|
2496 { |
|
71c8a45b2a35
Fixes for Mac code and allocate and free duplicates of title strings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1871
diff
changeset
|
2497 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
|
2498 { |
|
71c8a45b2a35
Fixes for Mac code and allocate and free duplicates of title strings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1871
diff
changeset
|
2499 [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
|
2500 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
|
2501 { |
|
71c8a45b2a35
Fixes for Mac code and allocate and free duplicates of title strings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1871
diff
changeset
|
2502 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
|
2503 [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
|
2504 [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
|
2505 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
|
2506 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
|
2507 } |
|
71c8a45b2a35
Fixes for Mac code and allocate and free duplicates of title strings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1871
diff
changeset
|
2508 } |
|
71c8a45b2a35
Fixes for Mac code and allocate and free duplicates of title strings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1871
diff
changeset
|
2509 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
|
2510 } |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2511 -(void)setup |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2512 { |
|
1774
4cc999e757a3
Check for pointerArrayWithWeakObjects before weakObjectsPointerArray on Mac
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1773
diff
changeset
|
2513 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
|
2514 |
|
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
|
2515 if(![[NSPointerArray class] respondsToSelector:swopa]) |
|
1774
4cc999e757a3
Check for pointerArrayWithWeakObjects before weakObjectsPointerArray on Mac
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1773
diff
changeset
|
2516 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
|
2517 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
|
2518 return; |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
2519 |
|
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
|
2520 IMP iwopa = [[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
|
2521 |
|
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
|
2522 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
|
2523 [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
|
2524 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
|
2525 [rowdatas retain]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2526 tvcols = [[[NSMutableArray alloc] init] retain]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2527 data = [[[NSMutableArray alloc] init] retain]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2528 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
|
2529 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
|
2530 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
|
2531 [self checkDark]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2532 [[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
|
2533 } |
|
1573
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2534 -(NSSize)getsize |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2535 { |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2536 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
|
2537 |
|
1573
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2538 if(tvcols) |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2539 { |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2540 int z; |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2541 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
|
2542 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
|
2543 |
|
1573
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2544 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
|
2545 { |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2546 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
|
2547 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
|
2548 |
|
1573
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2549 if(rowcount > 0) |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2550 { |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2551 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
|
2552 |
|
1573
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2553 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
|
2554 { |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2555 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
|
2556 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
|
2557 |
|
1573
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2558 /* 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
|
2559 if(z == 0) |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2560 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
|
2561 |
|
1573
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2562 /* 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
|
2563 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
|
2564 { |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2565 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
|
2566 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
|
2567 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
|
2568 { |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2569 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
|
2570 } |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2571 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
2572 |
|
1573
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2573 if(thiswidth > width) |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2574 { |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2575 width = thiswidth; |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2576 } |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2577 } |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2578 /* 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
|
2579 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
|
2580 { |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2581 width = 16; |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2582 } |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2583 } |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2584 if(width) |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2585 cwidth += width; |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2586 } |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2587 } |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2588 cwidth += 16; |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2589 cheight += 16; |
|
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
2590 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
|
2591 } |
|
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
|
2592 -(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
|
2593 { |
|
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
|
2594 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
|
2595 { |
|
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
|
2596 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
|
2597 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
|
2598 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
|
2599 |
|
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
|
2600 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
|
2601 { |
|
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
|
2602 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
|
2603 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
|
2604 { |
|
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
|
2605 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
|
2606 { |
|
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
|
2607 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
|
2608 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
|
2609 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
|
2610 |
|
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
|
2611 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
|
2612 { |
|
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
|
2613 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
|
2614 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
|
2615 |
|
866
ba9d38b8d0bc
Added code to check the image size inside the cell during optimize.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
864
diff
changeset
|
2616 /* 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
|
2617 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
|
2618 { |
|
ba9d38b8d0bc
Added code to check the image size inside the cell during optimize.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
864
diff
changeset
|
2619 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
|
2620 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
|
2621 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
|
2622 { |
|
ba9d38b8d0bc
Added code to check the image size inside the cell during optimize.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
864
diff
changeset
|
2623 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
|
2624 } |
|
ba9d38b8d0bc
Added code to check the image size inside the cell during optimize.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
864
diff
changeset
|
2625 } |
|
938
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
2626 |
|
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
|
2627 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
|
2628 { |
|
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
|
2629 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
|
2630 } |
|
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
|
2631 } |
|
866
ba9d38b8d0bc
Added code to check the image size inside the cell during optimize.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
864
diff
changeset
|
2632 /* 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
|
2633 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
|
2634 { |
|
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
|
2635 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
|
2636 } |
|
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
|
2637 /* 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
|
2638 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
|
2639 { |
|
1963
80f6be39b7fe
Mac: Miscellaneous container/listox fixes. Add a single pixel to the column
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1959
diff
changeset
|
2640 [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
|
2641 } |
|
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
|
2642 } |
|
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
|
2643 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
|
2644 { |
|
1963
80f6be39b7fe
Mac: Miscellaneous container/listox fixes. Add a single pixel to the column
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1959
diff
changeset
|
2645 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
|
2646 [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
|
2647 } |
|
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
|
2648 } |
|
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
|
2649 } |
|
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
|
2650 } |
|
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
|
2651 } |
|
938
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
2652 -(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
|
2653 { |
|
746cdd753e7a
Added coloring support for the Container/Tree/Listbox controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
809
diff
changeset
|
2654 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
|
2655 |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
2656 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
|
2657 [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
|
2658 |
|
810
746cdd753e7a
Added coloring support for the Container/Tree/Listbox controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
809
diff
changeset
|
2659 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
|
2660 { |
|
746cdd753e7a
Added coloring support for the Container/Tree/Listbox controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
809
diff
changeset
|
2661 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
|
2662 NSTextFieldCell *cell = [tableColumn dataCell]; |
|
746cdd753e7a
Added coloring support for the Container/Tree/Listbox controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
809
diff
changeset
|
2663 [cell setTextColor:fgcolor]; |
|
746cdd753e7a
Added coloring support for the Container/Tree/Listbox controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
809
diff
changeset
|
2664 } |
|
746cdd753e7a
Added coloring support for the Container/Tree/Listbox controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
809
diff
changeset
|
2665 } |
|
708
5fe2ca5ef88b
Fixes for container event handling. Also made container/listbox cells non-editable.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
707
diff
changeset
|
2666 -(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
|
2667 { |
|
1871
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
2668 void *params[2]; |
|
1922
a2a8145f3148
Turn off smart text and quote substitution on MLE.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1914
diff
changeset
|
2669 |
|
1871
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
2670 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
|
2671 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
|
2672 |
|
708
5fe2ca5ef88b
Fixes for container event handling. Also made container/listbox cells non-editable.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
707
diff
changeset
|
2673 /* 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
|
2674 _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
|
2675 } |
|
938
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
2676 -(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
|
2677 { |
|
829
f7b6c88bac47
Implemented Enter/Return triggering the item enter event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
828
diff
changeset
|
2678 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
|
2679 { |
|
1871
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
2680 void *params[2]; |
|
1922
a2a8145f3148
Turn off smart text and quote substitution on MLE.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1914
diff
changeset
|
2681 |
|
1871
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
2682 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
|
2683 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
|
2684 |
|
1871
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
2685 _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
|
2686 } |
|
829
f7b6c88bac47
Implemented Enter/Return triggering the item enter event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
828
diff
changeset
|
2687 [super keyUp:theEvent]; |
|
f7b6c88bac47
Implemented Enter/Return triggering the item enter event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
828
diff
changeset
|
2688 } |
|
f7b6c88bac47
Implemented Enter/Return triggering the item enter event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
828
diff
changeset
|
2689 |
|
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
|
2690 -(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
|
2691 { |
|
7fa26d8cc8d0
Fix for column click handler not working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
812
diff
changeset
|
2692 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
|
2693 |
|
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
|
2694 /* Handler for column click class */ |
|
813
7fa26d8cc8d0
Fix for column click handler not working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
812
diff
changeset
|
2695 _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
|
2696 } |
|
659
756015085da7
Fixes for container signal handling.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
658
diff
changeset
|
2697 -(void)selectionChanged:(id)sender |
|
756015085da7
Fixes for container signal handling.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
658
diff
changeset
|
2698 { |
|
1874
71c8a45b2a35
Fixes for Mac code and allocate and free duplicates of title strings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1871
diff
changeset
|
2699 void *params[2]; |
|
1922
a2a8145f3148
Turn off smart text and quote substitution on MLE.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1914
diff
changeset
|
2700 |
|
1874
71c8a45b2a35
Fixes for Mac code and allocate and free duplicates of title strings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1871
diff
changeset
|
2701 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
|
2702 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
|
2703 |
|
703
329736825f9b
Implemented more of the missing event/signal handlers and other code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
702
diff
changeset
|
2704 /* 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
|
2705 _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
|
2706 /* 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
|
2707 _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
|
2708 } |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2709 -(NSMenu *)menuForEvent:(NSEvent *)event |
|
659
756015085da7
Fixes for container signal handling.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
658
diff
changeset
|
2710 { |
|
710
78460ff977c1
Finishing up tree event/signal handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
709
diff
changeset
|
2711 int row; |
|
78460ff977c1
Finishing up tree event/signal handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
709
diff
changeset
|
2712 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
|
2713 row = (int)[self rowAtPoint:where]; |
|
78460ff977c1
Finishing up tree event/signal handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
709
diff
changeset
|
2714 _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
|
2715 return nil; |
|
659
756015085da7
Fixes for container signal handling.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
658
diff
changeset
|
2716 } |
|
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
|
2717 -(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
|
2718 { |
|
1809
5efaea897310
Fixed back tab handling for certain controls on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1808
diff
changeset
|
2719 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
|
2720 |
|
1809
5efaea897310
Fixed back tab handling for certain controls on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1808
diff
changeset
|
2721 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
|
2722 [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
|
2723 [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
|
2724 } |
|
eecf0eb609d8
Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1805
diff
changeset
|
2725 -(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
|
2726 -(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
|
2727 -(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
|
2728 @end |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
2729 |
|
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
|
2730 /* 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
|
2731 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
|
2732 { |
|
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
|
2733 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
|
2734 { |
|
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
|
2735 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
|
2736 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
|
2737 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
|
2738 |
|
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
|
2739 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
|
2740 index = [node indexOfObject:item]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2741 |
|
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
|
2742 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
|
2743 { |
|
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
|
2744 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
|
2745 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
|
2746 |
|
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
|
2747 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
|
2748 { |
|
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
|
2749 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
|
2750 } |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2751 |
|
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
|
2752 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
|
2753 { |
|
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
|
2754 _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
|
2755 [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
|
2756 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
|
2757 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
|
2758 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
|
2759 } |
|
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
|
2760 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
|
2761 { |
|
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
|
2762 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
|
2763 [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
|
2764 _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
|
2765 } |
|
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
|
2766 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
|
2767 _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
|
2768 } |
|
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
|
2769 } |
|
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
|
2770 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
|
2771 { |
|
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
|
2772 [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
|
2773 } |
|
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
|
2774 } |
|
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
|
2775 |
|
680
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2776 /* Subclass for a Tree type */ |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2777 @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
|
2778 #ifdef BUILDING_FOR_SNOW_LEOPARD |
|
813
7fa26d8cc8d0
Fix for column click handler not working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
812
diff
changeset
|
2779 <NSOutlineViewDataSource,NSOutlineViewDelegate> |
|
717
17923b931393
Fixes for building for MacOS 10.5 and PPC
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
715
diff
changeset
|
2780 #endif |
|
680
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2781 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2782 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
|
2783 NSTableColumn *treecol; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2784 NSMutableArray *data; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2785 /* 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
|
2786 * 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
|
2787 */ |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2788 id scrollview; |
|
810
746cdd753e7a
Added coloring support for the Container/Tree/Listbox controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
809
diff
changeset
|
2789 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
|
2790 } |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2791 -(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
|
2792 -(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
|
2793 -(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
|
2794 -(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
|
2795 -(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
|
2796 -(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
|
2797 -(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
|
2798 -(void *)userdata; |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2799 -(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
|
2800 -(void)treeSelectionChanged:(id)sender; |
|
722
5a8d5161651d
Implemented tree expand event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
721
diff
changeset
|
2801 -(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
|
2802 -(NSScrollView *)scrollview; |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2803 -(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
|
2804 -(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
|
2805 -(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
|
2806 -(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
|
2807 @end |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2808 |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2809 @implementation DWTree |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2810 -(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
|
2811 { |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2812 self = [super init]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2813 |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2814 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
|
2815 { |
|
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
|
2816 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
|
2817 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
|
2818 [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
|
2819 [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
|
2820 [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
|
2821 [[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
|
2822 [[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
|
2823 } |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2824 return self; |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2825 } |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2826 -(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
|
2827 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2828 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
|
2829 { |
|
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
|
2830 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
|
2831 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
|
2832 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2833 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2834 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2835 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
|
2836 } |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2837 } |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2838 -(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
|
2839 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2840 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
|
2841 } |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2842 -(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
|
2843 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2844 if(item) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2845 { |
|
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
|
2846 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
|
2847 { |
|
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
|
2848 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
|
2849 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
|
2850 } |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2851 else |
|
680
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2852 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2853 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
|
2854 } |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2855 } |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2856 else |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2857 { |
|
680
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2858 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
|
2859 } |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2860 } |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2861 -(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
|
2862 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2863 if(item) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2864 { |
|
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
|
2865 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
|
2866 { |
|
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
|
2867 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
|
2868 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
|
2869 } |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2870 else |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2871 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2872 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
|
2873 } |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2874 } |
|
680
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2875 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
|
2876 } |
|
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
|
2877 -(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
|
2878 { |
|
1206
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
2879 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
|
2880 { |
|
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
|
2881 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
|
2882 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
|
2883 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
|
2884 [(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
|
2885 } |
|
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
|
2886 } |
|
710
78460ff977c1
Finishing up tree event/signal handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
709
diff
changeset
|
2887 -(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
|
2888 -(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
|
2889 { |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2890 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
|
2891 if(parent) |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2892 { |
|
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
|
2893 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
|
2894 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
|
2895 { |
|
692
bd909322f40d
Added "retain"s to the DWTree/DWContainer/DWListBox classes memory allocation
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
691
diff
changeset
|
2896 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
|
2897 [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
|
2898 } |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2899 } |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2900 else |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2901 { |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2902 if(!data) |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2903 { |
|
692
bd909322f40d
Added "retain"s to the DWTree/DWContainer/DWListBox classes memory allocation
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
691
diff
changeset
|
2904 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
|
2905 } |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2906 } |
|
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
|
2907 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
|
2908 { |
|
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
|
2909 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
|
2910 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
|
2911 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
|
2912 [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
|
2913 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
|
2914 [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
|
2915 } |
|
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
|
2916 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
|
2917 { |
|
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
|
2918 [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
|
2919 } |
|
680
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2920 } |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2921 -(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
|
2922 -(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
|
2923 -(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
|
2924 { |
|
710
78460ff977c1
Finishing up tree event/signal handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
709
diff
changeset
|
2925 /* 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
|
2926 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
|
2927 |
|
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
|
2928 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
|
2929 { |
|
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
|
2930 _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
|
2931 } |
|
710
78460ff977c1
Finishing up tree event/signal handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
709
diff
changeset
|
2932 } |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2933 -(void)treeItemExpanded:(NSNotification *)notification |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2934 { |
|
722
5a8d5161651d
Implemented tree expand event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
721
diff
changeset
|
2935 id item = [[notification userInfo ] objectForKey: @"NSObject"]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2936 |
|
722
5a8d5161651d
Implemented tree expand event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
721
diff
changeset
|
2937 if(item) |
|
5a8d5161651d
Implemented tree expand event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
721
diff
changeset
|
2938 { |
|
5a8d5161651d
Implemented tree expand event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
721
diff
changeset
|
2939 _event_handler(self, (void *)item, 16); |
|
5a8d5161651d
Implemented tree expand event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
721
diff
changeset
|
2940 } |
|
5a8d5161651d
Implemented tree expand event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
721
diff
changeset
|
2941 } |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2942 -(NSMenu *)menuForEvent:(NSEvent *)event |
|
710
78460ff977c1
Finishing up tree event/signal handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
709
diff
changeset
|
2943 { |
|
78460ff977c1
Finishing up tree event/signal handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
709
diff
changeset
|
2944 int row; |
|
78460ff977c1
Finishing up tree event/signal handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
709
diff
changeset
|
2945 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
|
2946 row = (int)[self rowAtPoint:where]; |
|
78460ff977c1
Finishing up tree event/signal handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
709
diff
changeset
|
2947 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
|
2948 _event_handler(self, (NSEvent *)item, 10); |
|
710
78460ff977c1
Finishing up tree event/signal handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
709
diff
changeset
|
2949 return nil; |
|
709
5a268d5f1cfa
Fixes for tree event handling. Still more to come shortly...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
708
diff
changeset
|
2950 } |
|
680
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2951 -(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
|
2952 -(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
|
2953 -(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
|
2954 -(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
|
2955 { |
|
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
|
2956 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
|
2957 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
|
2958 [fgcolor retain]; |
|
810
746cdd753e7a
Added coloring support for the Container/Tree/Listbox controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
809
diff
changeset
|
2959 [cell setTextColor:fgcolor]; |
|
746cdd753e7a
Added coloring support for the Container/Tree/Listbox controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
809
diff
changeset
|
2960 } |
|
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
|
2961 -(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
|
2962 -(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
|
2963 { |
|
1809
5efaea897310
Fixed back tab handling for certain controls on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1808
diff
changeset
|
2964 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
|
2965 |
|
1809
5efaea897310
Fixed back tab handling for certain controls on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1808
diff
changeset
|
2966 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
|
2967 [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
|
2968 [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
|
2969 } |
|
eecf0eb609d8
Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1805
diff
changeset
|
2970 -(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
|
2971 -(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
|
2972 -(void)dealloc |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2973 { |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2974 UserData *root = userdata; |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2975 _remove_userdata(&root, NULL, TRUE); |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2976 _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
|
2977 [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
|
2978 dw_signal_disconnect_by_window(self); |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2979 [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
|
2980 } |
|
680
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2981 @end |
|
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
2982 |
|
656
6c8b95ca877b
Comboboxes implemented.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
655
diff
changeset
|
2983 /* Subclass for a Calendar type */ |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2984 @interface DWCalendar : NSDatePicker |
|
655
27eb39d2577b
Calendar and HTML functions filled in.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
654
diff
changeset
|
2985 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
2986 void *userdata; |
|
655
27eb39d2577b
Calendar and HTML functions filled in.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
654
diff
changeset
|
2987 } |
|
27eb39d2577b
Calendar and HTML functions filled in.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
654
diff
changeset
|
2988 -(void *)userdata; |
|
27eb39d2577b
Calendar and HTML functions filled in.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
654
diff
changeset
|
2989 -(void)setUserdata:(void *)input; |
|
27eb39d2577b
Calendar and HTML functions filled in.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
654
diff
changeset
|
2990 @end |
|
27eb39d2577b
Calendar and HTML functions filled in.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
654
diff
changeset
|
2991 |
|
27eb39d2577b
Calendar and HTML functions filled in.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
654
diff
changeset
|
2992 @implementation DWCalendar |
|
27eb39d2577b
Calendar and HTML functions filled in.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
654
diff
changeset
|
2993 -(void *)userdata { return userdata; } |
|
27eb39d2577b
Calendar and HTML functions filled in.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
654
diff
changeset
|
2994 -(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
|
2995 -(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
|
2996 @end |
|
27eb39d2577b
Calendar and HTML functions filled in.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
654
diff
changeset
|
2997 |
|
656
6c8b95ca877b
Comboboxes implemented.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
655
diff
changeset
|
2998 /* Subclass for a Combobox type */ |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
2999 @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
|
3000 #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
|
3001 <NSComboBoxDelegate> |
|
17923b931393
Fixes for building for MacOS 10.5 and PPC
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
715
diff
changeset
|
3002 #endif |
|
656
6c8b95ca877b
Comboboxes implemented.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
655
diff
changeset
|
3003 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3004 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
|
3005 id clickDefault; |
|
656
6c8b95ca877b
Comboboxes implemented.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
655
diff
changeset
|
3006 } |
|
6c8b95ca877b
Comboboxes implemented.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
655
diff
changeset
|
3007 -(void *)userdata; |
|
6c8b95ca877b
Comboboxes implemented.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
655
diff
changeset
|
3008 -(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
|
3009 -(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
|
3010 -(void)setClickDefault:(id)input; |
|
656
6c8b95ca877b
Comboboxes implemented.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
655
diff
changeset
|
3011 @end |
|
6c8b95ca877b
Comboboxes implemented.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
655
diff
changeset
|
3012 |
|
6c8b95ca877b
Comboboxes implemented.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
655
diff
changeset
|
3013 @implementation DWComboBox |
|
6c8b95ca877b
Comboboxes implemented.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
655
diff
changeset
|
3014 -(void *)userdata { return userdata; } |
|
6c8b95ca877b
Comboboxes implemented.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
655
diff
changeset
|
3015 -(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
|
3016 -(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
|
3017 -(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
|
3018 -(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
|
3019 { |
|
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
|
3020 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
|
3021 { |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
3022 [[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
|
3023 } else |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
3024 { |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
3025 [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
|
3026 } |
|
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
|
3027 } |
|
1312
c5db6c70905c
Added code to remove signal handlers when objects are destroyed on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1306
diff
changeset
|
3028 -(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
|
3029 @end |
|
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
3030 |
|
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
|
3031 /* 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
|
3032 /* 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
|
3033 @interface DWStepper : NSStepper |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
3034 { |
|
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
|
3035 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
|
3036 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
|
3037 } |
|
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
|
3038 -(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
|
3039 -(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
|
3040 -(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
|
3041 -(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
|
3042 -(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
|
3043 -(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
|
3044 @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
|
3045 |
|
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
|
3046 @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
|
3047 -(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
|
3048 -(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
|
3049 -(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
|
3050 -(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
|
3051 -(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
|
3052 { |
|
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
|
3053 [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
|
3054 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
|
3055 [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
|
3056 } |
|
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
|
3057 -(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
|
3058 { |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
3059 [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
|
3060 _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
|
3061 } |
|
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
|
3062 -(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
|
3063 { |
|
eecf0eb609d8
Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1805
diff
changeset
|
3064 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
|
3065 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
|
3066 { |
|
eecf0eb609d8
Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1805
diff
changeset
|
3067 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
|
3068 [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
|
3069 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
|
3070 [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
|
3071 [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
|
3072 } |
|
eecf0eb609d8
Added keyboard handling for (check/radio/spin)buttons, containers, trees, lists on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1805
diff
changeset
|
3073 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
|
3074 { |
|
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 } |
|
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)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
|
3080 -(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
|
3081 @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
|
3082 |
|
678
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
3083 /* Subclass for a Spinbutton type */ |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
3084 @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
|
3085 #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
|
3086 <NSTextFieldDelegate> |
|
17923b931393
Fixes for building for MacOS 10.5 and PPC
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
715
diff
changeset
|
3087 #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
|
3088 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3089 void *userdata; |
|
678
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
3090 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
|
3091 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
|
3092 id clickDefault; |
|
678
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
3093 } |
|
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
3094 -(id)init; |
|
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
3095 -(void *)userdata; |
|
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
3096 -(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
|
3097 -(NSTextField *)textfield; |
|
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
3098 -(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
|
3099 -(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
|
3100 -(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
|
3101 @end |
|
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
3102 |
|
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
3103 @implementation DWSpinButton |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
3104 -(id)init |
|
678
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
3105 { |
|
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
3106 self = [super init]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
3107 |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
3108 if(self) |
|
678
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
3109 { |
|
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
|
3110 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
|
3111 [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
|
3112 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
|
3113 [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
|
3114 [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
|
3115 [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
|
3116 [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
|
3117 [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
|
3118 } |
|
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
3119 return self; |
|
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
3120 } |
|
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
3121 -(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
|
3122 -(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
|
3123 -(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
|
3124 -(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
|
3125 -(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
|
3126 { |
|
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
|
3127 [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
|
3128 [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
|
3129 _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
|
3130 } |
|
768
7a236fdcf4ba
Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
767
diff
changeset
|
3131 -(void)setClickDefault:(id)input { clickDefault = input; } |
|
938
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
3132 -(void)keyUp:(NSEvent *)theEvent |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
3133 { |
|
768
7a236fdcf4ba
Fixed a typo in VK_RETURN and initial implementation of dw_window_click_default().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
767
diff
changeset
|
3134 if(clickDefault && [[theEvent charactersIgnoringModifiers] characterAtIndex:0] == VK_RETURN) |
|
938
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
3135 { |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
3136 [[self window] makeFirstResponder:clickDefault]; |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
3137 } |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
3138 else |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
3139 { |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
3140 [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
|
3141 } |
|
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
|
3142 } |
|
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
|
3143 -(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
|
3144 -(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
|
3145 @end |
|
6c8b95ca877b
Comboboxes implemented.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
655
diff
changeset
|
3146 |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
3147 /* 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
|
3148 * 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
|
3149 * 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
|
3150 */ |
|
014b02436c1f
Added MDI simulation code... the MDI "window" will just be a box for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
683
diff
changeset
|
3151 @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
|
3152 @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
|
3153 |
|
014b02436c1f
Added MDI simulation code... the MDI "window" will just be a box for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
683
diff
changeset
|
3154 @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
|
3155 @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
|
3156 |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3157 /* 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
|
3158 */ |
|
1853
4790589f52a9
Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1849
diff
changeset
|
3159 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
|
3160 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3161 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
|
3162 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3163 new->message = message; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3164 new->window = window; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3165 new->id = msgid; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3166 new->signalfunction = signalfunction; |
|
1853
4790589f52a9
Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1849
diff
changeset
|
3167 new->discfunction = discfunc; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3168 new->data = data; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3169 new->next = NULL; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
3170 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3171 if (!Root) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3172 Root = new; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3173 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3174 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3175 SignalHandler *prev = NULL, *tmp = Root; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3176 while(tmp) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3177 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3178 if(tmp->message == message && |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3179 tmp->window == window && |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3180 tmp->id == msgid && |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3181 tmp->signalfunction == signalfunction) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3182 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3183 tmp->data = data; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3184 free(new); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3185 return; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3186 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3187 prev = tmp; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3188 tmp = tmp->next; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3189 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3190 if(prev) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3191 prev->next = new; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3192 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3193 Root = new; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3194 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3195 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3196 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3197 /* 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
|
3198 ULONG _findsigmessage(char *signame) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3199 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3200 int z; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
3201 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3202 for(z=0;z<SIGNALMAX;z++) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3203 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3204 if(strcasecmp(signame, SignalTranslate[z].name) == 0) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3205 return SignalTranslate[z].message; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3206 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3207 return 0L; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3208 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3209 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3210 unsigned long _foreground = 0xAAAAAA, _background = 0; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3211 |
|
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
|
3212 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
|
3213 { |
|
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
|
3214 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
|
3215 |
|
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
|
3216 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
|
3217 { |
|
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
|
3218 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
|
3219 |
|
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
|
3220 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
|
3221 { |
|
1906
fac81560eb09
Fix a number of warning generated by the new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1905
diff
changeset
|
3222 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
|
3223 |
|
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
|
3224 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
|
3225 { |
|
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
|
3226 _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
|
3227 } |
|
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
|
3228 } |
|
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
|
3229 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
|
3230 { |
|
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
|
3231 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
|
3232 { |
|
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
|
3233 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
|
3234 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
|
3235 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
|
3236 |
|
b498fb0360fc
Mac: 10.14 seems to have drastically changed the drawing mechanism.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1940
diff
changeset
|
3237 /* 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
|
3238 * 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
|
3239 */ |
|
b498fb0360fc
Mac: 10.14 seems to have drastically changed the drawing mechanism.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1940
diff
changeset
|
3240 #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
|
3241 NSWindow *window = [render window]; |
|
1941
b498fb0360fc
Mac: 10.14 seems to have drastically changed the drawing mechanism.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1940
diff
changeset
|
3242 |
|
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
|
3243 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
|
3244 { |
|
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
|
3245 [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
|
3246 } |
|
1941
b498fb0360fc
Mac: 10.14 seems to have drastically changed the drawing mechanism.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1940
diff
changeset
|
3247 #endif |
|
b498fb0360fc
Mac: 10.14 seems to have drastically changed the drawing mechanism.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1940
diff
changeset
|
3248 |
|
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
|
3249 /* 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
|
3250 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
|
3251 { |
|
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
|
3252 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
|
3253 { |
|
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
|
3254 [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
|
3255 _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
|
3256 } |
|
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
|
3257 } |
|
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
|
3258 } |
|
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
|
3259 /* 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
|
3260 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
|
3261 { |
|
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
|
3262 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
|
3263 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
|
3264 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
|
3265 |
|
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
|
3266 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
|
3267 { |
|
1906
fac81560eb09
Fix a number of warning generated by the new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1905
diff
changeset
|
3268 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
|
3269 _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
|
3270 } |
|
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
|
3271 } |
|
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
|
3272 /* 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
|
3273 * 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
|
3274 */ |
|
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
|
3275 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
|
3276 { |
|
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
|
3277 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
|
3278 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
|
3279 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
|
3280 |
|
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
|
3281 /* 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
|
3282 _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
|
3283 } |
|
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
|
3284 } |
|
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
|
3285 } |
|
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
|
3286 } |
|
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
|
3287 |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3288 /* 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
|
3289 * and does expansion as necessary. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3290 */ |
|
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
|
3291 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
|
3292 { |
|
a50e8b486a1a
Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1435
diff
changeset
|
3293 /* 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
|
3294 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
|
3295 /* 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
|
3296 * 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
|
3297 * 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
|
3298 */ |
|
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
|
3299 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
|
3300 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
|
3301 |
|
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
|
3302 /* 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
|
3303 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
|
3304 |
|
798
1b0a0775ec19
Ok... groupbox calculation fix try #2!
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
797
diff
changeset
|
3305 /* Handle special groupbox case */ |
|
1b0a0775ec19
Ok... groupbox calculation fix try #2!
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
797
diff
changeset
|
3306 if(thisbox->grouphwnd) |
|
1b0a0775ec19
Ok... groupbox calculation fix try #2!
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
797
diff
changeset
|
3307 { |
|
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
|
3308 /* 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
|
3309 * 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
|
3310 */ |
|
a50e8b486a1a
Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1435
diff
changeset
|
3311 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
|
3312 { |
|
a50e8b486a1a
Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1435
diff
changeset
|
3313 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
|
3314 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
|
3315 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
|
3316 |
|
a50e8b486a1a
Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1435
diff
changeset
|
3317 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
|
3318 { |
|
a50e8b486a1a
Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1435
diff
changeset
|
3319 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
|
3320 } |
|
a50e8b486a1a
Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1435
diff
changeset
|
3321 /* 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
|
3322 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
|
3323 |
|
a50e8b486a1a
Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1435
diff
changeset
|
3324 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
|
3325 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
|
3326 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
3327 |
|
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
|
3328 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
|
3329 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
|
3330 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
|
3331 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
|
3332 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
3333 |
|
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
|
3334 /* 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
|
3335 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
|
3336 { |
|
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
|
3337 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
|
3338 |
|
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
|
3339 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
|
3340 { |
|
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
|
3341 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
|
3342 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
|
3343 |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3344 if(tmp) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3345 { |
|
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
|
3346 /* 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
|
3347 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
|
3348 { |
|
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
|
3349 (*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
|
3350 |
|
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
|
3351 /* 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
|
3352 _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
|
3353 |
|
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
|
3354 /* 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
|
3355 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
|
3356 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
|
3357 |
|
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
|
3358 /* 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
|
3359 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
|
3360 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
|
3361 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
|
3362 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
|
3363 |
|
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
|
3364 (*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
|
3365 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3366 } |
|
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
|
3367 } |
|
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
|
3368 |
|
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
|
3369 /* 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
|
3370 * 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
|
3371 */ |
|
a50e8b486a1a
Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1435
diff
changeset
|
3372 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
|
3373 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
|
3374 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
|
3375 |
|
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
|
3376 /* 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
|
3377 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
|
3378 { |
|
a50e8b486a1a
Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1435
diff
changeset
|
3379 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
|
3380 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
|
3381 |
|
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
|
3382 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
|
3383 { |
|
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
|
3384 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
|
3385 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
|
3386 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3387 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
|
3388 { |
|
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
|
3389 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
|
3390 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
|
3391 } |
|
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
|
3392 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
|
3393 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
|
3394 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
|
3395 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
|
3396 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
|
3397 } |
|
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
|
3398 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
|
3399 { |
|
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
|
3400 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
|
3401 uymax = itemheight; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3402 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
|
3403 { |
|
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
|
3404 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
|
3405 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
|
3406 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3407 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
|
3408 { |
|
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
|
3409 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
|
3410 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
|
3411 } |
|
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
|
3412 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
|
3413 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
|
3414 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
|
3415 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
|
3416 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
|
3417 } |
|
a50e8b486a1a
Initial layout 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 |
|
a50e8b486a1a
Initial layout 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 /* 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
|
3421 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
|
3422 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
|
3423 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
|
3424 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
|
3425 |
|
a50e8b486a1a
Initial layout 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 /* 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
|
3427 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
|
3428 { |
|
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
|
3429 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
|
3430 { |
|
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
|
3431 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
|
3432 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
|
3433 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
|
3434 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
|
3435 |
|
a50e8b486a1a
Initial layout 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 /* 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
|
3437 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
|
3438 { |
|
a50e8b486a1a
Initial layout 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 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
|
3440 { |
|
a50e8b486a1a
Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1435
diff
changeset
|
3441 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
|
3442 |
|
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
|
3443 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
|
3444 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
|
3445 } |
|
a50e8b486a1a
Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1435
diff
changeset
|
3446 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
|
3447 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
|
3448 } |
|
a50e8b486a1a
Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1435
diff
changeset
|
3449 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
|
3450 { |
|
1437
a50e8b486a1a
Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1435
diff
changeset
|
3451 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
|
3452 { |
|
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
|
3453 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
|
3454 |
|
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
|
3455 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
|
3456 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
|
3457 } |
|
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
|
3458 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
|
3459 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
|
3460 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
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 /* 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
|
3463 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
|
3464 { |
|
a50e8b486a1a
Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1435
diff
changeset
|
3465 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
|
3466 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
|
3467 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
|
3468 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
|
3469 |
|
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
|
3470 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
|
3471 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
|
3472 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
|
3473 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
|
3474 [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
|
3475 [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
|
3476 |
|
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
|
3477 /* 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
|
3478 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
|
3479 { |
|
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
|
3480 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
|
3481 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
|
3482 |
|
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
|
3483 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
|
3484 { |
|
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
|
3485 (*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
|
3486 _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
|
3487 (*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
|
3488 } |
|
837
89d4bad9c96e
Initial attempt at implementing the scrollbox on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
831
diff
changeset
|
3489 } |
|
938
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
3490 |
|
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 /* 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
|
3492 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
|
3493 { |
|
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 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
|
3495 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
|
3496 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
|
3497 |
|
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
|
3498 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
|
3499 { |
|
1906
fac81560eb09
Fix a number of warning generated by the new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1905
diff
changeset
|
3500 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
|
3501 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
|
3502 _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
|
3503 _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
|
3504 } |
|
837
89d4bad9c96e
Initial attempt at implementing the scrollbox on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
831
diff
changeset
|
3505 } |
|
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
|
3506 /* 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
|
3507 * 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
|
3508 */ |
|
43a5b3c78c41
Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
927
diff
changeset
|
3509 else 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
|
3510 { |
|
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
|
3511 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
|
3512 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
|
3513 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
|
3514 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
|
3515 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
|
3516 |
|
928
43a5b3c78c41
Two fixes... the first is on the fly calculation of groupbox border size. This also fixes some initial window issues...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
927
diff
changeset
|
3517 /* 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
|
3518 _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
|
3519 |
|
a50e8b486a1a
Initial layout 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 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
|
3521 { |
|
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
|
3522 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
|
3523 } |
|
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 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
|
3525 { |
|
1437
a50e8b486a1a
Initial layout engine 2.0 for the Mac... Windows and OS/2 may not compile until
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1435
diff
changeset
|
3526 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
|
3527 } |
|
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
|
3528 [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
|
3529 |
|
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
|
3530 /* 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
|
3531 _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
|
3532 _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
|
3533 } |
|
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
|
3534 /* 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
|
3535 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
|
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 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
|
3538 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
|
3539 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
|
3540 [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
|
3541 [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
|
3542 [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
|
3543 [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
|
3544 } |
|
1101
d7eafaa054ab
Added support for dw_window_redraw() causing splitbar panes to redraw without
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1100
diff
changeset
|
3545 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
|
3546 { |
|
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
|
3547 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
|
3548 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
|
3549 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
|
3550 |
|
1101
d7eafaa054ab
Added support for dw_window_redraw() causing splitbar panes to redraw without
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1100
diff
changeset
|
3551 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
|
3552 { |
|
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
|
3553 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
|
3554 [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
|
3555 } |
|
1101
d7eafaa054ab
Added support for dw_window_redraw() causing splitbar panes to redraw without
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1100
diff
changeset
|
3556 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
|
3557 { |
|
1128
7d7535f6bc4e
Added ability to set background color of MLE; setting foreground still outstanding.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1120
diff
changeset
|
3558 [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
|
3559 } |
|
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 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
3561 |
|
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
|
3562 /* 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
|
3563 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
|
3564 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
|
3565 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
|
3566 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
|
3567 } |
|
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
|
3568 } |
|
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
|
3569 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3570 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3571 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3572 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
|
3573 { |
|
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
|
3574 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
|
3575 { |
|
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
|
3576 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
|
3577 { |
|
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
|
3578 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
|
3579 |
|
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
|
3580 /* 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
|
3581 _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
|
3582 |
|
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
|
3583 /* 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
|
3584 _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
|
3585 } |
|
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 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3587 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3588 |
|
654
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
3589 NSMenu *_generate_main_menu() |
|
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
3590 { |
|
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
|
3591 NSString *applicationName = nil; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
3592 |
|
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
|
3593 /* 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
|
3594 #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
|
3595 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
|
3596 #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
|
3597 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
|
3598 { |
|
eba6ab48c952
Runtime Snow Leopard checks where possible and visual fix for Leopard status text.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
749
diff
changeset
|
3599 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
|
3600 } |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
3601 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3602 /* Create the main menu */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3603 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
|
3604 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3605 NSMenuItem * mitem = [mainMenu addItemWithTitle:@"Apple" action:NULL keyEquivalent:@""]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3606 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
|
3607 |
|
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
|
3608 #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
|
3609 [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
|
3610 #endif |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
3611 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3612 /* Setup the Application menu */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3613 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
|
3614 action:@selector(orderFrontStandardAboutPanel:) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3615 keyEquivalent:@""]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3616 [item setTarget:DWApp]; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
3617 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3618 [menu addItem:[NSMenuItem separatorItem]]; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
3619 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3620 item = [menu addItemWithTitle:NSLocalizedString(@"Services", nil) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3621 action:NULL |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3622 keyEquivalent:@""]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3623 NSMenu * servicesMenu = [[[NSMenu alloc] initWithTitle:@"Services"] autorelease]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3624 [menu setSubmenu:servicesMenu forItem:item]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3625 [DWApp setServicesMenu:servicesMenu]; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
3626 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3627 [menu addItem:[NSMenuItem separatorItem]]; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
3628 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3629 item = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"Hide", nil), applicationName] |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3630 action:@selector(hide:) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3631 keyEquivalent:@"h"]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3632 [item setTarget:DWApp]; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
3633 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3634 item = [menu addItemWithTitle:NSLocalizedString(@"Hide Others", nil) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3635 action:@selector(hideOtherApplications:) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3636 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
|
3637 [item setKeyEquivalentModifierMask:DWEventModifierFlagCommand | DWEventModifierFlagOption]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3638 [item setTarget:DWApp]; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
3639 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3640 item = [menu addItemWithTitle:NSLocalizedString(@"Show All", nil) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3641 action:@selector(unhideAllApplications:) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3642 keyEquivalent:@""]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3643 [item setTarget:DWApp]; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
3644 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3645 [menu addItem:[NSMenuItem separatorItem]]; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
3646 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3647 item = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"Quit", nil), applicationName] |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3648 action:@selector(terminate:) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3649 keyEquivalent:@"q"]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3650 [item setTarget:DWApp]; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
3651 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3652 [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
|
3653 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3654 return mainMenu; |
|
654
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
3655 } |
|
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
3656 |
|
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
3657 /* |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3658 * 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
|
3659 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3660 void API dw_main(void) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3661 { |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
3662 #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
|
3663 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
|
3664 #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
|
3665 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
|
3666 /* 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
|
3667 _dw_redraw(0, FALSE); |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3668 [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
|
3669 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
|
3670 #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
|
3671 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
|
3672 #endif |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3673 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3674 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3675 /* |
|
1528
5facb5380944
Added dw_main_quit() function for exiting the dw_main() loop.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1527
diff
changeset
|
3676 * 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
|
3677 */ |
|
5facb5380944
Added dw_main_quit() function for exiting the dw_main() loop.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1527
diff
changeset
|
3678 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
|
3679 { |
|
1529
92bed442620a
Didn't notice that [NSApplication stop] took a sender parameter on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1528
diff
changeset
|
3680 [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
|
3681 _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
|
3682 } |
|
5facb5380944
Added dw_main_quit() function for exiting the dw_main() loop.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1527
diff
changeset
|
3683 |
|
5facb5380944
Added dw_main_quit() function for exiting the dw_main() loop.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1527
diff
changeset
|
3684 /* |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3685 * 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
|
3686 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3687 * 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
|
3688 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3689 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
|
3690 { |
|
694
130ca42c4ae3
Reimplementation of dw_main_iteration and dw_main_sleep that actually work.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
693
diff
changeset
|
3691 DWTID curr = pthread_self(); |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
3692 |
|
694
130ca42c4ae3
Reimplementation of dw_main_iteration and dw_main_sleep that actually work.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
693
diff
changeset
|
3693 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
|
3694 { |
|
130ca42c4ae3
Reimplementation of dw_main_iteration and dw_main_sleep that actually work.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
693
diff
changeset
|
3695 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
|
3696 NSDate *until = [NSDate dateWithTimeIntervalSinceNow:(milliseconds/1000.0)]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
3697 |
|
695
3b17111499bf
Minor updates to the last commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
694
diff
changeset
|
3698 if(orig == (DWTID)-1) |
|
3b17111499bf
Minor updates to the last commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
694
diff
changeset
|
3699 { |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
3700 #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
|
3701 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
|
3702 #endif |
|
695
3b17111499bf
Minor updates to the last commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
694
diff
changeset
|
3703 DWThread = curr; |
|
3b17111499bf
Minor updates to the last commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
694
diff
changeset
|
3704 } |
|
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
|
3705 /* 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
|
3706 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
|
3707 { |
|
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
|
3708 /* Just loop */ |
|
695
3b17111499bf
Minor updates to the last commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
694
diff
changeset
|
3709 } |
|
3b17111499bf
Minor updates to the last commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
694
diff
changeset
|
3710 if(orig == (DWTID)-1) |
|
3b17111499bf
Minor updates to the last commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
694
diff
changeset
|
3711 { |
|
3b17111499bf
Minor updates to the last commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
694
diff
changeset
|
3712 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
|
3713 #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
|
3714 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
|
3715 #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
|
3716 } |
|
130ca42c4ae3
Reimplementation of dw_main_iteration and dw_main_sleep that actually work.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
693
diff
changeset
|
3717 } |
|
130ca42c4ae3
Reimplementation of dw_main_iteration and dw_main_sleep that actually work.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
693
diff
changeset
|
3718 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
|
3719 { |
|
694
130ca42c4ae3
Reimplementation of dw_main_iteration and dw_main_sleep that actually work.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
693
diff
changeset
|
3720 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
|
3721 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3722 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3723 |
|
700
7953f0471e4d
Some cleanups for the run loop iteration and thread system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
699
diff
changeset
|
3724 /* 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
|
3725 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
|
3726 { |
|
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
|
3727 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
|
3728 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
|
3729 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
|
3730 dequeue:YES]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
3731 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
|
3732 { |
|
130ca42c4ae3
Reimplementation of dw_main_iteration and dw_main_sleep that actually work.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
693
diff
changeset
|
3733 [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
|
3734 [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
|
3735 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
|
3736 } |
|
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
|
3737 return 0; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3738 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3739 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3740 /* |
|
700
7953f0471e4d
Some cleanups for the run loop iteration and thread system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
699
diff
changeset
|
3741 * 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
|
3742 */ |
|
7953f0471e4d
Some cleanups for the run loop iteration and thread system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
699
diff
changeset
|
3743 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
|
3744 { |
|
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
|
3745 DWTID curr = pthread_self(); |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
3746 |
|
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
|
3747 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
|
3748 { |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
3749 #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
|
3750 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
|
3751 #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
|
3752 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
|
3753 _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
|
3754 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
|
3755 #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
|
3756 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
|
3757 #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
|
3758 } |
|
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
|
3759 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
|
3760 { |
|
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
|
3761 _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
|
3762 } |
|
700
7953f0471e4d
Some cleanups for the run loop iteration and thread system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
699
diff
changeset
|
3763 } |
|
7953f0471e4d
Some cleanups for the run loop iteration and thread system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
699
diff
changeset
|
3764 |
|
7953f0471e4d
Some cleanups for the run loop iteration and thread system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
699
diff
changeset
|
3765 /* |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3766 * 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
|
3767 */ |
|
c836603d3f14
Add dw_shutdown() function which does the same thing as dw_exit() ...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1853
diff
changeset
|
3768 void API dw_shutdown(void) |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3769 { |
|
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
|
3770 #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
|
3771 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
|
3772 [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
|
3773 #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
|
3774 } |
|
c836603d3f14
Add dw_shutdown() function which does the same thing as dw_exit() ...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1853
diff
changeset
|
3775 |
|
c836603d3f14
Add dw_shutdown() function which does the same thing as dw_exit() ...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1853
diff
changeset
|
3776 /* |
|
c836603d3f14
Add dw_shutdown() function which does the same thing as dw_exit() ...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1853
diff
changeset
|
3777 * 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
|
3778 * Parameters: |
|
c836603d3f14
Add dw_shutdown() function which does the same thing as dw_exit() ...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1853
diff
changeset
|
3779 * 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
|
3780 */ |
|
c836603d3f14
Add dw_shutdown() function which does the same thing as dw_exit() ...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1853
diff
changeset
|
3781 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
|
3782 { |
|
c836603d3f14
Add dw_shutdown() function which does the same thing as dw_exit() ...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1853
diff
changeset
|
3783 dw_shutdown(); |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3784 exit(exitcode); |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3785 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3786 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3787 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3788 * 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
|
3789 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3790 * ptr: Pointer to dynamic windows allocated |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3791 * memory to be free()'d. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3792 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3793 void API dw_free(void *ptr) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3794 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3795 free(ptr); |
|
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 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3798 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3799 * 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
|
3800 * 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
|
3801 * OS/2 and Windows). |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3802 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3803 char *dw_user_dir(void) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3804 { |
|
1381
3ba4853d5b78
Initial attempt at dw_app_dir() for OS/2, Windows and Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1378
diff
changeset
|
3805 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
|
3806 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3807 if(!_user_dir[0]) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3808 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3809 char *home = getenv("HOME"); |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
3810 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3811 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
|
3812 strncpy(_user_dir, home, PATH_MAX); |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3813 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3814 strcpy(_user_dir, "/"); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3815 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3816 return _user_dir; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3817 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3818 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3819 /* |
|
1381
3ba4853d5b78
Initial attempt at dw_app_dir() for OS/2, Windows and Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1378
diff
changeset
|
3820 * 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
|
3821 * 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
|
3822 */ |
|
1384
156e32814c83
Cleanup of the previous commits and added Unix support.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1383
diff
changeset
|
3823 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
|
3824 { |
|
3ba4853d5b78
Initial attempt at dw_app_dir() for OS/2, Windows and Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1378
diff
changeset
|
3825 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
|
3826 } |
|
3ba4853d5b78
Initial attempt at dw_app_dir() for OS/2, Windows and Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1378
diff
changeset
|
3827 |
|
3ba4853d5b78
Initial attempt at dw_app_dir() for OS/2, Windows and Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1378
diff
changeset
|
3828 /* |
|
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
|
3829 * 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
|
3830 * 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
|
3831 * 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
|
3832 * ...: 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
|
3833 */ |
|
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
|
3834 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
|
3835 { |
|
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
|
3836 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
|
3837 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
|
3838 |
|
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
|
3839 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
|
3840 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
|
3841 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
|
3842 |
|
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
|
3843 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
|
3844 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
3845 |
|
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
|
3846 /* |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3847 * 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
|
3848 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3849 * 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
|
3850 * 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
|
3851 * format: printf style format string. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3852 * ...: 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
|
3853 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3854 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
|
3855 { |
|
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
|
3856 NSInteger iResponse; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3857 NSString *button1 = @"OK"; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3858 NSString *button2 = nil; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3859 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
|
3860 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
|
3861 NSString *mtext; |
|
8d130e45430d
Mac: Rewrite dw_messagebox() to make it thread safe on Mojave.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1984
diff
changeset
|
3862 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
|
3863 NSArray *params; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3864 va_list args; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
3865 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3866 if(flags & DW_MB_OKCANCEL) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3867 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3868 button2 = @"Cancel"; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3869 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3870 else if(flags & DW_MB_YESNO) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3871 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3872 button1 = @"Yes"; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3873 button2 = @"No"; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3874 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3875 else if(flags & DW_MB_YESNOCANCEL) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3876 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3877 button1 = @"Yes"; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3878 button2 = @"No"; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3879 button3 = @"Cancel"; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3880 } |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
3881 |
|
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
|
3882 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
|
3883 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
|
3884 va_end(args); |
|
1922
a2a8145f3148
Turn off smart text and quote substitution on MLE.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1914
diff
changeset
|
3885 |
|
1914
3872ab37297b
Fix numerous deprecation warnings building with SDK 10.12 Sierra.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1908
diff
changeset
|
3886 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
|
3887 mstyle = DWAlertStyleCritical; |
|
1914
3872ab37297b
Fix numerous deprecation warnings building with SDK 10.12 Sierra.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1908
diff
changeset
|
3888 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
|
3889 mstyle = DWAlertStyleInformational; |
|
8d130e45430d
Mac: Rewrite dw_messagebox() to make it thread safe on Mojave.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1984
diff
changeset
|
3890 |
|
8d130e45430d
Mac: Rewrite dw_messagebox() to make it thread safe on Mojave.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1984
diff
changeset
|
3891 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
|
3892 [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
|
3893 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
|
3894 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3895 switch(iResponse) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3896 { |
|
1902
74f50459c530
Fix some deprecations introduced in Mac OS X Yosemite 10.10...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1896
diff
changeset
|
3897 case NSAlertFirstButtonReturn: /* user pressed OK */ |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3898 if(flags & DW_MB_YESNO || flags & DW_MB_YESNOCANCEL) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3899 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3900 return DW_MB_RETURN_YES; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3901 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3902 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
|
3903 case NSAlertSecondButtonReturn: /* user pressed Cancel */ |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3904 if(flags & DW_MB_OKCANCEL) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3905 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3906 return DW_MB_RETURN_CANCEL; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3907 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3908 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
|
3909 case NSAlertThirdButtonReturn: /* user pressed the third button */ |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3910 return DW_MB_RETURN_CANCEL; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3911 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3912 return 0; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3913 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3914 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3915 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3916 * 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
|
3917 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3918 * title: Title bar text for dialog. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3919 * 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
|
3920 * ext: Default file extention. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3921 * 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
|
3922 * Returns: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
3923 * 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
|
3924 * the file path on success. |
|
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 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
|
3928 { |
|
1298
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3929 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
|
3930 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
|
3931 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
|
3932 |
|
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
|
3933 /* 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
|
3934 * 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
|
3935 */ |
|
1704
873304f581be
Fix Unicode issues with the directory browser on Windows.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1679
diff
changeset
|
3936 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
|
3937 { |
|
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3938 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
|
3939 |
|
1298
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3940 /* 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
|
3941 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
|
3942 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
|
3943 |
|
1298
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3944 /* 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
|
3945 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
|
3946 { |
|
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3947 /* 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
|
3948 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
|
3949 path = temp; |
|
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3950 else |
|
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3951 file = temp; |
|
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3952 } |
|
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3953 /* 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
|
3954 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
|
3955 { |
|
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3956 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
|
3957 |
|
1298
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3958 /* 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
|
3959 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
|
3960 { |
|
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3961 x--; |
|
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3962 } |
|
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3963 if(temp[x] == '/') |
|
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3964 { |
|
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3965 temp[x] = 0; |
|
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3966 /* 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
|
3967 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
|
3968 { |
|
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3969 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
|
3970 { |
|
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3971 /* 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
|
3972 path = temp; |
|
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3973 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
|
3974 } |
|
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3975 } |
|
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3976 } |
|
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3977 } |
|
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3978 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
3979 |
|
825
8a2e3138e1e4
Implemented DW_DIRECTORY_OPEN on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
821
diff
changeset
|
3980 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
|
3981 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3982 /* Create the File Open Dialog class. */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3983 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
|
3984 |
|
1298
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
3985 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
|
3986 { |
|
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
|
3987 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
|
3988 |
|
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
|
3989 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
|
3990 { |
|
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
|
3991 IMP isdu = [openDlg methodForSelector: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
|
3992 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
|
3993 } |
|
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
|
3994 } |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
3995 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
3996 /* 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
|
3997 if(flags == DW_FILE_OPEN) |
|
8a2e3138e1e4
Implemented DW_DIRECTORY_OPEN on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
821
diff
changeset
|
3998 { |
|
8a2e3138e1e4
Implemented DW_DIRECTORY_OPEN on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
821
diff
changeset
|
3999 [openDlg setCanChooseFiles:YES]; |
|
8a2e3138e1e4
Implemented DW_DIRECTORY_OPEN on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
821
diff
changeset
|
4000 [openDlg setCanChooseDirectories:NO]; |
|
8a2e3138e1e4
Implemented DW_DIRECTORY_OPEN on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
821
diff
changeset
|
4001 } |
|
8a2e3138e1e4
Implemented DW_DIRECTORY_OPEN on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
821
diff
changeset
|
4002 else |
|
8a2e3138e1e4
Implemented DW_DIRECTORY_OPEN on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
821
diff
changeset
|
4003 { |
|
8a2e3138e1e4
Implemented DW_DIRECTORY_OPEN on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
821
diff
changeset
|
4004 [openDlg setCanChooseFiles:NO]; |
|
8a2e3138e1e4
Implemented DW_DIRECTORY_OPEN on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
821
diff
changeset
|
4005 [openDlg setCanChooseDirectories:YES]; |
|
8a2e3138e1e4
Implemented DW_DIRECTORY_OPEN on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
821
diff
changeset
|
4006 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
4007 |
|
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
|
4008 /* Handle file types */ |
|
1704
873304f581be
Fix Unicode issues with the directory browser on Windows.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1679
diff
changeset
|
4009 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
|
4010 { |
|
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
|
4011 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
|
4012 [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
|
4013 } |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
4014 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4015 /* Disable multiple selection */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4016 [openDlg setAllowsMultipleSelection:NO]; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
4017 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4018 /* Display the dialog. If the OK button was pressed, |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4019 * process the files. |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4020 */ |
|
1903
b94b4ad26a05
Minor fixes and changes to remove deprecation warnings in 10.10 and
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1902
diff
changeset
|
4021 if([openDlg runModal] == DWModalResponseOK) |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4022 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4023 /* Get an array containing the full filenames of all |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4024 * files and directories selected. |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4025 */ |
|
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
|
4026 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
|
4027 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
|
4028 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
|
4029 { |
|
a51397ea24bf
Added local auto-release macros on Mac to allow us to prevent leaks
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1574
diff
changeset
|
4030 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
|
4031 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
|
4032 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
|
4033 } |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4034 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4035 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4036 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4037 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4038 /* Create the File Save Dialog class. */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4039 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
|
4040 |
|
1298
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
4041 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
|
4042 { |
|
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
|
4043 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
|
4044 |
|
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
|
4045 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
|
4046 { |
|
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
|
4047 IMP isdu = [saveDlg methodForSelector: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
|
4048 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
|
4049 } |
|
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
|
4050 } |
|
1298
79db0563c7c2
Code to split the file and path apart on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1296
diff
changeset
|
4051 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
|
4052 { |
|
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
|
4053 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
|
4054 |
|
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
|
4055 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
|
4056 { |
|
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
|
4057 IMP isnfsv = [saveDlg methodForSelector: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
|
4058 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
|
4059 } |
|
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
|
4060 } |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
4061 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4062 /* Enable the creation of directories in the dialog. */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4063 [saveDlg setCanCreateDirectories:YES]; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
4064 |
|
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
|
4065 /* Handle file types */ |
|
1704
873304f581be
Fix Unicode issues with the directory browser on Windows.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1679
diff
changeset
|
4066 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
|
4067 { |
|
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
|
4068 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
|
4069 [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
|
4070 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
4071 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4072 /* Display the dialog. If the OK button was pressed, |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4073 * process the files. |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4074 */ |
|
1934
487fd711bf3f
Mac: Fix deprecation warning in the 10.13 SDK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1925
diff
changeset
|
4075 #if defined(MAC_OS_X_VERSION_10_9) && ((defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9) || !defined(MAC_OS_X_VERSION_MAX_ALLOWED)) |
|
487fd711bf3f
Mac: Fix deprecation warning in the 10.13 SDK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1925
diff
changeset
|
4076 if([saveDlg runModal] == NSModalResponseOK) |
|
487fd711bf3f
Mac: Fix deprecation warning in the 10.13 SDK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1925
diff
changeset
|
4077 #else |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4078 if([saveDlg runModal] == NSFileHandlingPanelOKButton) |
|
1934
487fd711bf3f
Mac: Fix deprecation warning in the 10.13 SDK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1925
diff
changeset
|
4079 #endif |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4080 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4081 /* Get an array containing the full filenames of all |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4082 * files and directories selected. |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4083 */ |
|
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
|
4084 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
|
4085 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
|
4086 { |
|
a51397ea24bf
Added local auto-release macros on Mac to allow us to prevent leaks
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1574
diff
changeset
|
4087 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
|
4088 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
|
4089 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
|
4090 } |
|
a51397ea24bf
Added local auto-release macros on Mac to allow us to prevent leaks
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1574
diff
changeset
|
4091 } |
|
a51397ea24bf
Added local auto-release macros on Mac to allow us to prevent leaks
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1574
diff
changeset
|
4092 } |
|
a51397ea24bf
Added local auto-release macros on Mac to allow us to prevent leaks
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1574
diff
changeset
|
4093 DW_LOCAL_POOL_OUT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4094 return NULL; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4095 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4096 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4097 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4098 * 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
|
4099 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4100 * None. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4101 * Returns: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4102 * 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
|
4103 * be converted to text. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4104 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4105 char *dw_clipboard_get_text() |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4106 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4107 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
|
4108 NSString *str = [pasteboard stringForType:NSPasteboardTypeString]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4109 if(str != nil) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4110 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4111 return strdup([ str UTF8String ]); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4112 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4113 return NULL; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4114 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4115 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4116 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4117 * 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
|
4118 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4119 * Text. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4120 */ |
|
651
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
4121 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
|
4122 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4123 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
|
4124 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
|
4125 |
|
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
|
4126 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
|
4127 { |
|
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
|
4128 IMP icc = [pasteboard methodForSelector: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
|
4129 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
|
4130 } |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
4131 |
|
1936
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
4132 [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
|
4133 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4134 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4135 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4136 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4137 * Allocates and initializes a dialog struct. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4138 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4139 * 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
|
4140 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4141 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
|
4142 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4143 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
|
4144 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4145 if(tmp) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4146 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4147 tmp->eve = dw_event_new(); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4148 dw_event_reset(tmp->eve); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4149 tmp->data = data; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4150 tmp->done = FALSE; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4151 tmp->result = NULL; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4152 } |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
4153 return tmp; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4154 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4155 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4156 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4157 * 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
|
4158 * initial called of dw_dialog_wait(). |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4159 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4160 * 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
|
4161 * 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
|
4162 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4163 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
|
4164 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4165 dialog->result = result; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4166 dw_event_post(dialog->eve); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4167 dialog->done = TRUE; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4168 return 0; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4169 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4170 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4171 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4172 * 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
|
4173 * 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
|
4174 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4175 * 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
|
4176 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4177 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
|
4178 { |
|
1886
f7d408a47752
Fix a couple of errors reported by the static analyzer on Mac....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1885
diff
changeset
|
4179 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
|
4180 |
|
f7d408a47752
Fix a couple of errors reported by the static analyzer on Mac....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1885
diff
changeset
|
4181 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
|
4182 { |
|
f7d408a47752
Fix a couple of errors reported by the static analyzer on Mac....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1885
diff
changeset
|
4183 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
|
4184 { |
|
f7d408a47752
Fix a couple of errors reported by the static analyzer on Mac....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1885
diff
changeset
|
4185 _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
|
4186 } |
|
f7d408a47752
Fix a couple of errors reported by the static analyzer on Mac....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1885
diff
changeset
|
4187 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
|
4188 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
|
4189 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
|
4190 } |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4191 return tmp; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4192 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4193 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4194 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4195 * 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
|
4196 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4197 * 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
|
4198 * 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
|
4199 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
4200 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
|
4201 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
|
4202 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
|
4203 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
|
4204 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
4205 DW_FUNCTION_INIT; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
4206 DWBox *view = [[DWBox alloc] init]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4207 Box *newbox = [view box]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4208 memset(newbox, 0, sizeof(Box)); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4209 newbox->pad = pad; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4210 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
|
4211 DW_FUNCTION_RETURN_THIS(view); |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4212 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4213 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4214 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4215 * 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
|
4216 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4217 * 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
|
4218 * 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
|
4219 * 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
|
4220 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4221 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
|
4222 { |
|
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
|
4223 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
|
4224 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
|
4225 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
|
4226 |
|
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
|
4227 [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
|
4228 [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
|
4229 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
|
4230 [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
|
4231 [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
|
4232 return groupbox; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4233 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4234 |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
4235 /* |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
4236 * Create a new scrollable Box to be packed. |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
4237 * Parameters: |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
4238 * 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
|
4239 * 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
|
4240 */ |
|
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
|
4241 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
|
4242 { |
|
837
89d4bad9c96e
Initial attempt at implementing the scrollbox on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
831
diff
changeset
|
4243 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
|
4244 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
|
4245 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
|
4246 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
|
4247 [scrollbox setHasVerticalScroller:YES]; |
|
89d4bad9c96e
Initial attempt at implementing the scrollbox on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
831
diff
changeset
|
4248 [scrollbox setHasHorizontalScroller:YES]; |
|
89d4bad9c96e
Initial attempt at implementing the scrollbox on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
831
diff
changeset
|
4249 [scrollbox setBorderType:NSNoBorder]; |
|
838
8e0405435d0a
Minor scrollbox fixes...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
837
diff
changeset
|
4250 [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
|
4251 [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
|
4252 [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
|
4253 [tmpbox autorelease]; |
|
837
89d4bad9c96e
Initial attempt at implementing the scrollbox on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
831
diff
changeset
|
4254 return scrollbox; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
4255 } |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
4256 |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
4257 /* |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
4258 * 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
|
4259 * Parameters: |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
4260 * handle: Handle to the scrollbox to be queried. |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
4261 * orient: The vertical or horizontal scrollbar. |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
4262 */ |
|
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
|
4263 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
|
4264 { |
|
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
|
4265 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
|
4266 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
|
4267 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
|
4268 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
|
4269 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
|
4270 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
|
4271 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
|
4272 { |
|
5103d132c3cd
Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
840
diff
changeset
|
4273 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
|
4274 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
|
4275 } |
|
5103d132c3cd
Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
840
diff
changeset
|
4276 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
|
4277 { |
|
5103d132c3cd
Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
840
diff
changeset
|
4278 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
|
4279 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
|
4280 } |
|
5103d132c3cd
Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
840
diff
changeset
|
4281 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
|
4282 { |
|
5103d132c3cd
Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
840
diff
changeset
|
4283 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
|
4284 } |
|
5103d132c3cd
Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
840
diff
changeset
|
4285 return val; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
4286 } |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
4287 |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
4288 /* |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
4289 * 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
|
4290 * Parameters: |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
4291 * handle: Handle to the scrollbox to be queried. |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
4292 * orient: The vertical or horizontal scrollbar. |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
4293 */ |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
4294 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
|
4295 { |
|
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
|
4296 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
|
4297 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
|
4298 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
|
4299 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
|
4300 { |
|
5103d132c3cd
Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
840
diff
changeset
|
4301 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
|
4302 } |
|
5103d132c3cd
Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
840
diff
changeset
|
4303 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
|
4304 { |
|
5103d132c3cd
Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
840
diff
changeset
|
4305 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
|
4306 } |
|
5103d132c3cd
Implemented dw_scrollbox_get_range() and dw_scrollbox_get_pos() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
840
diff
changeset
|
4307 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
|
4308 } |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
4309 |
|
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
|
4310 /* 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
|
4311 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
|
4312 { |
|
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
|
4313 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
|
4314 { |
|
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
|
4315 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
|
4316 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
|
4317 } |
|
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
|
4318 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
|
4319 { |
|
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
|
4320 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
|
4321 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
|
4322 |
|
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
|
4323 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
|
4324 { |
|
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
|
4325 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
|
4326 } |
|
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
|
4327 } |
|
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
|
4328 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
|
4329 } |
|
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
|
4330 |
|
1410
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
4331 /* 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
|
4332 * 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
|
4333 * |
|
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
|
4334 * 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
|
4335 * 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
|
4336 * 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
|
4337 * 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
|
4338 * 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
|
4339 * 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
|
4340 * 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
|
4341 */ |
|
1410
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
4342 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
|
4343 { |
|
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
4344 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
|
4345 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
|
4346 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
|
4347 |
|
1410
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
4348 /* 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
|
4349 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
|
4350 { |
|
1420
fabf23bdc7fb
New Mac image button handling code was catching checkboxes/radiobuttons as well.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1419
diff
changeset
|
4351 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
|
4352 { |
|
1936
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
4353 case DWButtonTypeSwitch: |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
4354 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
|
4355 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
|
4356 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
|
4357 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
|
4358 break; |
|
fabf23bdc7fb
New Mac image button handling code was catching checkboxes/radiobuttons as well.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1419
diff
changeset
|
4359 default: |
|
1419
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4360 { |
|
1420
fabf23bdc7fb
New Mac image button handling code was catching checkboxes/radiobuttons as well.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1419
diff
changeset
|
4361 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
|
4362 |
|
1420
fabf23bdc7fb
New Mac image button handling code was catching checkboxes/radiobuttons as well.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1419
diff
changeset
|
4363 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
|
4364 { |
|
fabf23bdc7fb
New Mac image button handling code was catching checkboxes/radiobuttons as well.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1419
diff
changeset
|
4365 /* 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
|
4366 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
|
4367 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
|
4368 thisheight = (int)size.height; |
|
1432
6aa94c8a91de
Bordered bitmap buttons need extra padding.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1429
diff
changeset
|
4369 if([object isBordered]) |
|
6aa94c8a91de
Bordered bitmap buttons need extra padding.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1429
diff
changeset
|
4370 { |
|
6aa94c8a91de
Bordered bitmap buttons need extra padding.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1429
diff
changeset
|
4371 extrawidth = 4; |
|
6aa94c8a91de
Bordered bitmap buttons need extra padding.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1429
diff
changeset
|
4372 extraheight = 4; |
|
6aa94c8a91de
Bordered bitmap buttons need extra padding.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1429
diff
changeset
|
4373 } |
|
1420
fabf23bdc7fb
New Mac image button handling code was catching checkboxes/radiobuttons as well.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1419
diff
changeset
|
4374 } |
|
fabf23bdc7fb
New Mac image button handling code was catching checkboxes/radiobuttons as well.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1419
diff
changeset
|
4375 else |
|
fabf23bdc7fb
New Mac image button handling code was catching checkboxes/radiobuttons as well.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1419
diff
changeset
|
4376 { |
|
fabf23bdc7fb
New Mac image button handling code was catching checkboxes/radiobuttons as well.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1419
diff
changeset
|
4377 /* 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
|
4378 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
|
4379 |
|
1419
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4380 if([object isBordered]) |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4381 { |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4382 extrawidth = 30; |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4383 extraheight = 8; |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4384 } |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4385 else |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4386 { |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4387 extrawidth = 8; |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4388 extraheight = 4; |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4389 } |
|
1420
fabf23bdc7fb
New Mac image button handling code was catching checkboxes/radiobuttons as well.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1419
diff
changeset
|
4390 } |
|
fabf23bdc7fb
New Mac image button handling code was catching checkboxes/radiobuttons as well.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1419
diff
changeset
|
4391 break; |
|
1419
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4392 } |
|
1410
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
4393 } |
|
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
4394 } |
|
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
4395 /* 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
|
4396 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
|
4397 { |
|
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
4398 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
|
4399 |
|
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
|
4400 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
|
4401 { |
|
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
|
4402 /* 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
|
4403 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
|
4404 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
|
4405 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
|
4406 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
|
4407 /* 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
|
4408 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
|
4409 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
|
4410 /* 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
|
4411 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
|
4412 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
|
4413 } |
|
1410
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
4414 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
|
4415 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
|
4416 |
|
1410
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
4417 if(font) |
|
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
4418 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
|
4419 } |
|
1419
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4420 /* 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
|
4421 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
|
4422 [ object isMemberOfClass:[DWSlider class] ]) |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4423 { |
|
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
|
4424 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
|
4425 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
|
4426 } |
|
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
|
4427 /* 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
|
4428 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
|
4429 { |
|
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
|
4430 if([object vertical]) |
|
1419
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4431 { |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4432 thiswidth = 14; |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4433 thisheight = 100; |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4434 } |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4435 else |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4436 { |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4437 thiswidth = 100; |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4438 thisheight = 14; |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4439 } |
|
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4440 } |
|
1421
63d253a2cdd9
Added bitmap autosizing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1420
diff
changeset
|
4441 /* Handle bitmap size */ |
|
63d253a2cdd9
Added bitmap autosizing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1420
diff
changeset
|
4442 else if([ object isMemberOfClass:[NSImageView class] ]) |
|
63d253a2cdd9
Added bitmap autosizing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1420
diff
changeset
|
4443 { |
|
63d253a2cdd9
Added bitmap autosizing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1420
diff
changeset
|
4444 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
|
4445 |
|
1421
63d253a2cdd9
Added bitmap autosizing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1420
diff
changeset
|
4446 if(image) |
|
63d253a2cdd9
Added bitmap autosizing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1420
diff
changeset
|
4447 { |
|
63d253a2cdd9
Added bitmap autosizing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1420
diff
changeset
|
4448 NSSize size = [image size]; |
|
63d253a2cdd9
Added bitmap autosizing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1420
diff
changeset
|
4449 thiswidth = (int)size.width; |
|
63d253a2cdd9
Added bitmap autosizing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1420
diff
changeset
|
4450 thisheight = (int)size.height; |
|
63d253a2cdd9
Added bitmap autosizing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1420
diff
changeset
|
4451 } |
|
63d253a2cdd9
Added bitmap autosizing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1420
diff
changeset
|
4452 } |
|
1533
7bc189ef0cd0
Add code to determine the size of the calendar control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1531
diff
changeset
|
4453 /* 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
|
4454 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
|
4455 { |
|
7bc189ef0cd0
Add code to determine the size of the calendar control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1531
diff
changeset
|
4456 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
|
4457 |
|
1533
7bc189ef0cd0
Add code to determine the size of the calendar control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1531
diff
changeset
|
4458 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
|
4459 { |
|
7bc189ef0cd0
Add code to determine the size of the calendar control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1531
diff
changeset
|
4460 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
|
4461 |
|
1533
7bc189ef0cd0
Add code to determine the size of the calendar control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1531
diff
changeset
|
4462 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
|
4463 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
|
4464 } |
|
7bc189ef0cd0
Add code to determine the size of the calendar control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1531
diff
changeset
|
4465 } |
|
1551
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
4466 /* MLE and Container */ |
|
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
4467 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
|
4468 [ object isMemberOfClass:[DWContainer class] ]) |
|
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
4469 { |
|
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
4470 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
|
4471 |
|
1551
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
4472 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
|
4473 { |
|
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
4474 NSScrollView *sv = [object scrollview]; |
|
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
4475 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
|
4476 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
|
4477 |
|
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
|
4478 /* 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
|
4479 if(!hscroll) |
|
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
4480 { |
|
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
4481 [[object textContainer] setWidthTracksTextView:NO]; |
|
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
4482 [[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
|
4483 [object setHorizontallyResizable:YES]; |
|
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
4484 [sv setHasHorizontalScroller:YES]; |
|
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
4485 } |
|
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
|
4486 /* 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
|
4487 [object sizeToFit]; |
|
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
4488 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
|
4489 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
|
4490 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
|
4491 /* 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
|
4492 if(!hscroll) |
|
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
4493 { |
|
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
4494 [[object textContainer] setWidthTracksTextView:YES]; |
|
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
4495 [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
|
4496 |
|
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
|
4497 /* 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
|
4498 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
|
4499 { |
|
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
|
4500 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
|
4501 |
|
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
|
4502 /* 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
|
4503 [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
|
4504 /* 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
|
4505 [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
|
4506 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
|
4507 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
|
4508 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
|
4509 [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
|
4510 } |
|
1551
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
4511 } |
|
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
4512 [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
|
4513 /* 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
|
4514 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
|
4515 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
|
4516 } |
|
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
4517 else |
|
1573
d6e17c8f4de2
Fixed container and listbox not accounting for contents on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1566
diff
changeset
|
4518 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
|
4519 |
|
1551
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
4520 thiswidth = size.width; |
|
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
4521 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
|
4522 |
|
1549
ca6be9c48fff
Implemented auto-sizing containers on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1543
diff
changeset
|
4523 if(thiswidth < _DW_SCROLLED_MIN_WIDTH) |
|
ca6be9c48fff
Implemented auto-sizing containers on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1543
diff
changeset
|
4524 thiswidth = _DW_SCROLLED_MIN_WIDTH; |
|
ca6be9c48fff
Implemented auto-sizing containers on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1543
diff
changeset
|
4525 if(thiswidth > _DW_SCROLLED_MAX_WIDTH) |
|
ca6be9c48fff
Implemented auto-sizing containers on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1543
diff
changeset
|
4526 thiswidth = _DW_SCROLLED_MAX_WIDTH; |
|
ca6be9c48fff
Implemented auto-sizing containers on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1543
diff
changeset
|
4527 if(thisheight < _DW_SCROLLED_MIN_HEIGHT) |
|
ca6be9c48fff
Implemented auto-sizing containers on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1543
diff
changeset
|
4528 thisheight = _DW_SCROLLED_MIN_HEIGHT; |
|
ca6be9c48fff
Implemented auto-sizing containers on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1543
diff
changeset
|
4529 if(thisheight > _DW_SCROLLED_MAX_HEIGHT) |
|
ca6be9c48fff
Implemented auto-sizing containers on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1543
diff
changeset
|
4530 thisheight = _DW_SCROLLED_MAX_HEIGHT; |
|
ca6be9c48fff
Implemented auto-sizing containers on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1543
diff
changeset
|
4531 } |
|
1551
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
4532 /* Tree */ |
|
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
4533 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
|
4534 { |
|
1566
035bc006afbe
Experimental change... halfway between min and max for tree controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1564
diff
changeset
|
4535 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
|
4536 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
|
4537 } |
|
1533
7bc189ef0cd0
Add code to determine the size of the calendar control on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1531
diff
changeset
|
4538 /* 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
|
4539 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
|
4540 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
|
4541 |
|
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
4542 /* 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
|
4543 * 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
|
4544 */ |
|
d84a690448c3
Attempted fix at border calculation on Mac for status text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1559
diff
changeset
|
4545 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
|
4546 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
|
4547 |
|
1418
461240f946d0
Status text fields needs extra space on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1411
diff
changeset
|
4548 /* 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
|
4549 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
|
4550 { |
|
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
|
4551 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
|
4552 |
|
1778
e71ab68198ce
Minor cleanups for the Mac status text changes for 10.8.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1776
diff
changeset
|
4553 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
|
4554 |
|
1418
461240f946d0
Status text fields needs extra space on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1411
diff
changeset
|
4555 /* 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
|
4556 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
|
4557 { |
|
1778
e71ab68198ce
Minor cleanups for the Mac status text changes for 10.8.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1776
diff
changeset
|
4558 extrawidth += 2; |
|
e71ab68198ce
Minor cleanups for the Mac status text changes for 10.8.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1776
diff
changeset
|
4559 extraheight = 8; |
|
e71ab68198ce
Minor cleanups for the Mac status text changes for 10.8.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1776
diff
changeset
|
4560 } |
|
1418
461240f946d0
Status text fields needs extra space on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1411
diff
changeset
|
4561 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
4562 |
|
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
|
4563 /* 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
|
4564 if(width) |
|
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
4565 *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
|
4566 if(height) |
|
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
4567 *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
|
4568 } |
|
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
4569 |
|
1086
4254c9b6d50d
Merge all 3 box packing functions into one internal function on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1079
diff
changeset
|
4570 /* 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
|
4571 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
|
4572 { |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
4573 //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
|
4574 //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
|
4575 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
|
4576 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
|
4577 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
|
4578 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
|
4579 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
|
4580 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
|
4581 |
|
1086
4254c9b6d50d
Merge all 3 box packing functions into one internal function on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1079
diff
changeset
|
4582 /* |
|
4254c9b6d50d
Merge all 3 box packing functions into one internal function on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1079
diff
changeset
|
4583 * 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
|
4584 * 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
|
4585 */ |
|
4254c9b6d50d
Merge all 3 box packing functions into one internal function on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1079
diff
changeset
|
4586 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
|
4587 { |
|
4254c9b6d50d
Merge all 3 box packing functions into one internal function on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1079
diff
changeset
|
4588 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
|
4589 return; |
|
4254c9b6d50d
Merge all 3 box packing functions into one internal function on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1079
diff
changeset
|
4590 } |
|
1128
7d7535f6bc4e
Added ability to set background color of MLE; setting foreground still outstanding.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1120
diff
changeset
|
4591 |
|
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
|
4592 /* 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
|
4593 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
|
4594 { |
|
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
|
4595 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
|
4596 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
|
4597 } |
|
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
|
4598 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
|
4599 { |
|
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
|
4600 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
|
4601 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
|
4602 } |
|
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
|
4603 |
|
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
|
4604 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
|
4605 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
|
4606 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
|
4607 |
|
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
|
4608 /* 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
|
4609 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
|
4610 [ 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
|
4611 [ 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
|
4612 { |
|
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
|
4613 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
|
4614 } |
|
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
|
4615 |
|
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
|
4616 /* 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
|
4617 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
|
4618 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
|
4619 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
|
4620 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
|
4621 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
|
4622 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
|
4623 |
|
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
|
4624 /* 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
|
4625 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
|
4626 |
|
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
|
4627 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
|
4628 { |
|
1079
5d3acda4acd4
Fixed a minor cut and paste error and formatting on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1077
diff
changeset
|
4629 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
|
4630 x++; |
|
5d3acda4acd4
Fixed a minor cut and paste error and formatting on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1077
diff
changeset
|
4631 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
|
4632 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
|
4633 } |
|
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
|
4634 |
|
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
|
4635 /* 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
|
4636 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
|
4637 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
|
4638 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
|
4639 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
|
4640 |
|
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
|
4641 /* 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
|
4642 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
|
4643 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
|
4644 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
|
4645 { |
|
4254c9b6d50d
Merge all 3 box packing functions into one internal function on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1079
diff
changeset
|
4646 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
|
4647 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
|
4648 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
|
4649 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
|
4650 |
|
1086
4254c9b6d50d
Merge all 3 box packing functions into one internal function on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1079
diff
changeset
|
4651 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
|
4652 } |
|
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
|
4653 |
|
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
|
4654 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
|
4655 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
|
4656 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
|
4657 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
|
4658 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
|
4659 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
|
4660 |
|
1410
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
4661 /* 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
|
4662 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
|
4663 _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
|
4664 |
|
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
|
4665 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
|
4666 |
|
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
|
4667 /* 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
|
4668 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
|
4669 |
|
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
|
4670 /* 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
|
4671 [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
|
4672 /* 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
|
4673 * 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
|
4674 */ |
|
9f12bc79924b
Autorelease fixes for Mac allowing the objects to dealloc when destroyed.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1312
diff
changeset
|
4675 [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
|
4676 /* 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
|
4677 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
|
4678 { |
|
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 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
|
4680 |
|
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 /* 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
|
4682 * 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
|
4683 */ |
|
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 [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
|
4685 } |
|
1419
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
4686 /* 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
|
4687 _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
|
4688 |
|
34f1d6f5f1c3
Added function dw_box_pack_at_index() on Windows, Mac and OS/2. And an example usage in dwtest.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1075
diff
changeset
|
4689 /* 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
|
4690 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
|
4691 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
|
4692 //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
|
4693 } |
|
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
|
4694 |
|
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
|
4695 /* |
|
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
|
4696 * 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
|
4697 * Parameters: |
|
1679
e19b93a8229b
More comment cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1678
diff
changeset
|
4698 * 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
|
4699 * 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
|
4700 * 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
|
4701 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
4702 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
|
4703 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
|
4704 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
|
4705 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
|
4706 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
4707 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
|
4708 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
|
4709 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
|
4710 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
|
4711 |
|
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
|
4712 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
|
4713 { |
|
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
|
4714 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
|
4715 |
|
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
|
4716 /* 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
|
4717 * 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
|
4718 */ |
|
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
|
4719 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
|
4720 && [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
|
4721 { |
|
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
|
4722 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
|
4723 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
|
4724 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
4725 |
|
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
|
4726 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
|
4727 { |
|
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
|
4728 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
|
4729 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
|
4730 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
|
4731 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
|
4732 |
|
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
|
4733 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
|
4734 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
|
4735 |
|
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
|
4736 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
|
4737 { |
|
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
|
4738 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
|
4739 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
|
4740 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
4741 |
|
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
|
4742 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
|
4743 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
|
4744 else |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
4745 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
4746 [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
|
4747 [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
|
4748 |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
4749 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
|
4750 { |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
4751 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
|
4752 |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
4753 /* 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
|
4754 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
|
4755 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
4756 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
|
4757 } |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
4758 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
|
4759 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
4760 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
|
4761 } |
|
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
|
4762 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
4763 |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
4764 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
|
4765 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
|
4766 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
|
4767 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
|
4768 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
|
4769 else |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
4770 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
|
4771 /* 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
|
4772 _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
|
4773 } |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
4774 } |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
4775 } |
|
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
|
4776 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
|
4777 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
|
4778 } |
|
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
|
4779 |
|
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
|
4780 /* |
|
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
|
4781 * 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
|
4782 * 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
|
4783 * 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
|
4784 * 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
|
4785 * Returns: |
|
1679
e19b93a8229b
More comment cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1678
diff
changeset
|
4786 * 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
|
4787 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
4788 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
|
4789 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
|
4790 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
|
4791 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
|
4792 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
4793 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
|
4794 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
|
4795 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
|
4796 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
|
4797 |
|
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
|
4798 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
|
4799 { |
|
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 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
|
4801 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
|
4802 |
|
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 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
|
4804 { |
|
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 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
|
4806 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
|
4807 |
|
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
|
4808 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
|
4809 |
|
1672
42890a2b8d3e
Fix minor issues with dw_box_remove_at_index() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1671
diff
changeset
|
4810 if(object) |
|
42890a2b8d3e
Fix minor issues with dw_box_remove_at_index() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1671
diff
changeset
|
4811 { |
|
42890a2b8d3e
Fix minor issues with dw_box_remove_at_index() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1671
diff
changeset
|
4812 [object retain]; |
|
42890a2b8d3e
Fix minor issues with dw_box_remove_at_index() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1671
diff
changeset
|
4813 [object removeFromSuperview]; |
|
42890a2b8d3e
Fix minor issues with dw_box_remove_at_index() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1671
diff
changeset
|
4814 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
4815 |
|
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
|
4816 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
|
4817 { |
|
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
|
4818 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
|
4819 |
|
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
|
4820 /* 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
|
4821 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
|
4822 { |
|
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
|
4823 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
|
4824 } |
|
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
|
4825 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
|
4826 { |
|
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
|
4827 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
|
4828 } |
|
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
|
4829 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
4830 |
|
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
|
4831 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
|
4832 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
|
4833 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
|
4834 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
|
4835 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
|
4836 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
|
4837 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
|
4838 |
|
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
|
4839 /* 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
|
4840 _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
|
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 } |
|
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 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
|
4844 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
|
4845 } |
|
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 |
|
d5f39d32c4da
Initial implementation of dw_box_remove() and dw_box_remove_at_index() for Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1664
diff
changeset
|
4847 /* |
|
1086
4254c9b6d50d
Merge all 3 box packing functions into one internal function on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1079
diff
changeset
|
4848 * 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
|
4849 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4850 * 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
|
4851 * 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
|
4852 * 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
|
4853 * 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
|
4854 * 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
|
4855 * 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
|
4856 * 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
|
4857 * 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
|
4858 */ |
|
1086
4254c9b6d50d
Merge all 3 box packing functions into one internal function on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1079
diff
changeset
|
4859 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
|
4860 { |
|
4254c9b6d50d
Merge all 3 box packing functions into one internal function on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1079
diff
changeset
|
4861 _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
|
4862 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4863 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4864 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4865 * 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
|
4866 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4867 * 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
|
4868 * 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
|
4869 * 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
|
4870 * 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
|
4871 * 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
|
4872 * 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
|
4873 * 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
|
4874 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4875 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
|
4876 { |
|
1128
7d7535f6bc4e
Added ability to set background color of MLE; setting foreground still outstanding.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1120
diff
changeset
|
4877 /* 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
|
4878 * 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
|
4879 */ |
|
4254c9b6d50d
Merge all 3 box packing functions into one internal function on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1079
diff
changeset
|
4880 _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
|
4881 } |
|
4254c9b6d50d
Merge all 3 box packing functions into one internal function on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1079
diff
changeset
|
4882 |
|
4254c9b6d50d
Merge all 3 box packing functions into one internal function on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1079
diff
changeset
|
4883 /* |
|
4254c9b6d50d
Merge all 3 box packing functions into one internal function on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1079
diff
changeset
|
4884 * 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
|
4885 * Parameters: |
|
4254c9b6d50d
Merge all 3 box packing functions into one internal function on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1079
diff
changeset
|
4886 * 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
|
4887 * 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
|
4888 * 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
|
4889 * 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
|
4890 * 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
|
4891 * 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
|
4892 * 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
|
4893 */ |
|
4254c9b6d50d
Merge all 3 box packing functions into one internal function on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1079
diff
changeset
|
4894 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
|
4895 { |
|
4254c9b6d50d
Merge all 3 box packing functions into one internal function on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1079
diff
changeset
|
4896 _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
|
4897 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4898 |
|
685
314a12dccd20
Cleanups for conflicts with "id" which is a keyword in Objective-C.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
684
diff
changeset
|
4899 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
|
4900 { |
|
744
9882b0dfa304
Added an internal Mac function for setting the default Dynamic Windows font.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
743
diff
changeset
|
4901 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
|
4902 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
|
4903 { |
|
9882b0dfa304
Added an internal Mac function for setting the default Dynamic Windows font.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
743
diff
changeset
|
4904 [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
|
4905 } |
|
9882b0dfa304
Added an internal Mac function for setting the default Dynamic Windows font.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
743
diff
changeset
|
4906 [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
|
4907 [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
|
4908 [button setTag:cid]; |
|
1936
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
4909 [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
|
4910 [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
|
4911 /* 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
|
4912 [[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
|
4913 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
|
4914 { |
|
9882b0dfa304
Added an internal Mac function for setting the default Dynamic Windows font.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
743
diff
changeset
|
4915 [[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
|
4916 } |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
4917 return button; |
|
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
4918 } |
|
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
4919 |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4920 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4921 * 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
|
4922 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4923 * 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
|
4924 * 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
|
4925 */ |
|
685
314a12dccd20
Cleanups for conflicts with "id" which is a keyword in Objective-C.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
684
diff
changeset
|
4926 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
|
4927 { |
|
314a12dccd20
Cleanups for conflicts with "id" which is a keyword in Objective-C.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
684
diff
changeset
|
4928 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
|
4929 [button setButtonType:DWButtonTypeMomentaryPushIn]; |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
4930 [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
|
4931 [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
|
4932 [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
|
4933 [[button cell] setControlTint:NSBlueControlTint]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4934 return button; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4935 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4936 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4937 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4938 * 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
|
4939 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4940 * 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
|
4941 * 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
|
4942 */ |
|
685
314a12dccd20
Cleanups for conflicts with "id" which is a keyword in Objective-C.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
684
diff
changeset
|
4943 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
|
4944 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4945 DWEntryField *entry = [[DWEntryField alloc] init]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4946 [entry setStringValue:[ NSString stringWithUTF8String:text ]]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4947 [entry setTag:cid]; |
|
1712
daa59fc8d6e5
Disable wrapping on entryfields and static text on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1709
diff
changeset
|
4948 [[entry cell] setScrollable:YES]; |
|
daa59fc8d6e5
Disable wrapping on entryfields and static text on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1709
diff
changeset
|
4949 [[entry cell] setWraps:NO]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4950 return entry; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4951 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4952 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4953 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4954 * 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
|
4955 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4956 * 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
|
4957 * 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
|
4958 */ |
|
685
314a12dccd20
Cleanups for conflicts with "id" which is a keyword in Objective-C.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
684
diff
changeset
|
4959 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
|
4960 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4961 DWEntryFieldPassword *entry = [[DWEntryFieldPassword alloc] init]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4962 [entry setStringValue:[ NSString stringWithUTF8String:text ]]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4963 [entry setTag:cid]; |
|
1712
daa59fc8d6e5
Disable wrapping on entryfields and static text on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1709
diff
changeset
|
4964 [[entry cell] setScrollable:YES]; |
|
daa59fc8d6e5
Disable wrapping on entryfields and static text on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1709
diff
changeset
|
4965 [[entry cell] setWraps:NO]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
4966 return entry; |
|
650
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 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4970 * Sets the entryfield character limit. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4971 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4972 * 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
|
4973 * 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
|
4974 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4975 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
|
4976 { |
|
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
|
4977 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
|
4978 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
|
4979 |
|
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
|
4980 [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
|
4981 [[entry cell] setFormatter:formatter]; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4982 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4983 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4984 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4985 * 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
|
4986 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4987 * 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
|
4988 * 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
|
4989 */ |
|
670
0b920d0dc13e
Implemented bitmap buttons and pixmaps from bundle resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
669
diff
changeset
|
4990 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
|
4991 { |
|
0b920d0dc13e
Implemented bitmap buttons and pixmaps from bundle resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
669
diff
changeset
|
4992 NSBundle *bundle = [NSBundle mainBundle]; |
|
0b920d0dc13e
Implemented bitmap buttons and pixmaps from bundle resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
669
diff
changeset
|
4993 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
|
4994 NSString *filepath = [respath stringByAppendingFormat:@"/%lu.png", resid]; |
| 749 | 4995 NSImage *image = [[NSImage alloc] initWithContentsOfFile:filepath]; |
| 4996 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
|
4997 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
|
4998 { |
|
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
|
4999 [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
|
5000 } |
|
1396
117cc38a3799
Allow on Mac passing NULL as bubbletext to dw_bitmapbutton_new*.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1389
diff
changeset
|
5001 if(text) |
|
117cc38a3799
Allow on Mac passing NULL as bubbletext to dw_bitmapbutton_new*.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1389
diff
changeset
|
5002 [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
|
5003 [image release]; |
| 749 | 5004 return button; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5005 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5006 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5007 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5008 * 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
|
5009 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5010 * 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
|
5011 * 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
|
5012 * 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
|
5013 * DW pick the appropriate file extension. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5014 * (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
|
5015 */ |
|
685
314a12dccd20
Cleanups for conflicts with "id" which is a keyword in Objective-C.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
684
diff
changeset
|
5016 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
|
5017 { |
|
938
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
5018 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
|
5019 |
|
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
|
5020 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
|
5021 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
|
5022 |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
5023 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
|
5024 { |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
5025 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
|
5026 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
|
5027 } |
| 749 | 5028 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
|
5029 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
|
5030 { |
|
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
|
5031 [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
|
5032 } |
|
1396
117cc38a3799
Allow on Mac passing NULL as bubbletext to dw_bitmapbutton_new*.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1389
diff
changeset
|
5033 if(text) |
|
117cc38a3799
Allow on Mac passing NULL as bubbletext to dw_bitmapbutton_new*.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1389
diff
changeset
|
5034 [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
|
5035 [image release]; |
| 749 | 5036 return button; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5037 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5038 |
|
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 * 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
|
5041 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5042 * 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
|
5043 * 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
|
5044 * data: The contents of the image |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5045 * (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
|
5046 * len: length of str |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5047 */ |
|
685
314a12dccd20
Cleanups for conflicts with "id" which is a keyword in Objective-C.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
684
diff
changeset
|
5048 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
|
5049 { |
|
760
2fb17622a455
Possible fix for exception in dw_bitmapbutton_new_from_data()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
755
diff
changeset
|
5050 NSData *thisdata = [NSData dataWithBytes:data length:len]; |
| 749 | 5051 NSImage *image = [[NSImage alloc] initWithData:thisdata]; |
| 5052 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
|
5053 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
|
5054 { |
|
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
|
5055 [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
|
5056 } |
|
1396
117cc38a3799
Allow on Mac passing NULL as bubbletext to dw_bitmapbutton_new*.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1389
diff
changeset
|
5057 if(text) |
|
117cc38a3799
Allow on Mac passing NULL as bubbletext to dw_bitmapbutton_new*.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1389
diff
changeset
|
5058 [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
|
5059 [image release]; |
| 749 | 5060 return button; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5061 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5062 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5063 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5064 * Create a new spinbutton window (widget) to be packed. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5065 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5066 * text: The 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
|
5067 * id: An ID to be used with dw_window_from_id() or 0L. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5068 */ |
|
685
314a12dccd20
Cleanups for conflicts with "id" which is a keyword in Objective-C.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
684
diff
changeset
|
5069 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
|
5070 { |
|
678
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
5071 DWSpinButton *spinbutton = [[DWSpinButton alloc] init]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5072 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
|
5073 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
|
5074 [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
|
5075 [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
|
5076 [stepper setMinValue:-65536]; |
|
8188f818eb9f
Changed initial spinbutton limits to -65536 to 65536 on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1018
diff
changeset
|
5077 [stepper setMaxValue:65536]; |
|
8188f818eb9f
Changed initial spinbutton limits to -65536 to 65536 on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1018
diff
changeset
|
5078 [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
|
5079 [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
|
5080 return spinbutton; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5081 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5082 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5083 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5084 * Sets the spinbutton value. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5085 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5086 * 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
|
5087 * position: Current value of the spinbutton. |
|
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 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
|
5090 { |
|
678
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
5091 DWSpinButton *spinbutton = handle; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5092 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
|
5093 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
|
5094 [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
|
5095 [textfield takeIntValueFrom:stepper]; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5096 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5097 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5098 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5099 * Sets the spinbutton limits. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5100 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5101 * 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
|
5102 * upper: Upper limit. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5103 * lower: Lower limit. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5104 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5105 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
|
5106 { |
|
678
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
5107 DWSpinButton *spinbutton = handle; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5108 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
|
5109 [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
|
5110 [stepper setMaxValue:(double)upper]; |
|
650
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 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5113 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5114 * 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
|
5115 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5116 * 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
|
5117 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5118 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
|
5119 { |
|
678
0ec8edbb82cf
Basic spinbutton implementation, something isn't quite working right but
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
677
diff
changeset
|
5120 DWSpinButton *spinbutton = handle; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5121 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
|
5122 return (long)[stepper integerValue]; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5123 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5124 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5125 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5126 * 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
|
5127 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5128 * 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
|
5129 * 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
|
5130 */ |
|
685
314a12dccd20
Cleanups for conflicts with "id" which is a keyword in Objective-C.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
684
diff
changeset
|
5131 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
|
5132 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5133 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
|
5134 [button setButtonType:DWButtonTypeRadio]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5135 return button; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5136 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5137 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5138 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5139 * 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
|
5140 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5141 * 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
|
5142 * increments: Number of increments available. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5143 * 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
|
5144 */ |
|
685
314a12dccd20
Cleanups for conflicts with "id" which is a keyword in Objective-C.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
684
diff
changeset
|
5145 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
|
5146 { |
|
704
336800e9e648
Fixes to the slider control so events happen.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
703
diff
changeset
|
5147 DWSlider *slider = [[DWSlider alloc] init]; |
|
336800e9e648
Fixes to the slider control so events happen.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
703
diff
changeset
|
5148 [slider setMaxValue:(double)increments]; |
|
336800e9e648
Fixes to the slider control so events happen.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
703
diff
changeset
|
5149 [slider setMinValue:0]; |
|
336800e9e648
Fixes to the slider control so events happen.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
703
diff
changeset
|
5150 [slider setContinuous:YES]; |
|
336800e9e648
Fixes to the slider control so events happen.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
703
diff
changeset
|
5151 [slider setTarget:slider]; |
|
336800e9e648
Fixes to the slider control so events happen.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
703
diff
changeset
|
5152 [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
|
5153 [slider setTag:cid]; |
|
704
336800e9e648
Fixes to the slider control so events happen.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
703
diff
changeset
|
5154 return slider; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5155 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5156 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5157 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5158 * Returns the position of the slider. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5159 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5160 * 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
|
5161 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5162 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
|
5163 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5164 DWSlider *slider = handle; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5165 double val = [slider doubleValue]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5166 return (int)val; |
|
650
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 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5169 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5170 * Sets the slider position. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5171 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5172 * 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
|
5173 * 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
|
5174 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5175 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
|
5176 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5177 DWSlider *slider = handle; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5178 [slider setDoubleValue:(double)position]; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5179 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5180 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5181 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5182 * 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
|
5183 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5184 * 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
|
5185 * increments: Number of increments available. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5186 * 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
|
5187 */ |
|
685
314a12dccd20
Cleanups for conflicts with "id" which is a keyword in Objective-C.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
684
diff
changeset
|
5188 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
|
5189 { |
|
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
|
5190 DWScrollbar *scrollbar; |
|
689
4199730e9889
Fixed errors creating scrollbars.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
688
diff
changeset
|
5191 if(vertical) |
|
4199730e9889
Fixed errors creating scrollbars.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
688
diff
changeset
|
5192 { |
|
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
|
5193 scrollbar = [[DWScrollbar alloc] init]; |
|
1419
8827e9b14b40
Initial support for automatic window redrawing on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1418
diff
changeset
|
5194 [scrollbar setVertical:YES]; |
|
689
4199730e9889
Fixed errors creating scrollbars.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
688
diff
changeset
|
5195 } |
|
4199730e9889
Fixed errors creating scrollbars.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
688
diff
changeset
|
5196 else |
|
4199730e9889
Fixed errors creating scrollbars.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
688
diff
changeset
|
5197 { |
|
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
|
5198 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
|
5199 } |
|
1941
b498fb0360fc
Mac: 10.14 seems to have drastically changed the drawing mechanism.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1940
diff
changeset
|
5200 #ifndef BUILDING_FOR_YOSEMITE |
|
689
4199730e9889
Fixed errors creating scrollbars.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
688
diff
changeset
|
5201 [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
|
5202 #endif |
|
689
4199730e9889
Fixed errors creating scrollbars.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
688
diff
changeset
|
5203 [scrollbar setRange:0.0 andVisible:0.0]; |
|
4199730e9889
Fixed errors creating scrollbars.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
688
diff
changeset
|
5204 [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
|
5205 [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
|
5206 [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
|
5207 [scrollbar setTag:cid]; |
|
689
4199730e9889
Fixed errors creating scrollbars.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
688
diff
changeset
|
5208 [scrollbar setEnabled:YES]; |
|
4199730e9889
Fixed errors creating scrollbars.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
688
diff
changeset
|
5209 return scrollbar; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5210 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5211 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5212 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5213 * Returns the position of the scrollbar. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5214 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5215 * 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
|
5216 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5217 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
|
5218 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5219 DWScrollbar *scrollbar = handle; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5220 float range = [scrollbar range]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5221 float fresult = [scrollbar doubleValue] * range; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5222 return (int)fresult; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5223 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5224 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5225 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5226 * Sets the scrollbar position. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5227 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5228 * 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
|
5229 * 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
|
5230 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5231 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
|
5232 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5233 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
|
5234 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
|
5235 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
|
5236 double newpos = (double)position/(range-visible); |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5237 [scrollbar setDoubleValue:newpos]; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5238 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5239 |
|
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 * Sets the scrollbar range. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5242 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5243 * 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
|
5244 * range: Maximum range value. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5245 * 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
|
5246 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5247 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
|
5248 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5249 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
|
5250 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
|
5251 [scrollbar setRange:(double)range andVisible:(double)visible]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5252 [scrollbar setKnobProportion:knob]; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5253 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5254 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5255 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5256 * 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
|
5257 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5258 * 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
|
5259 */ |
|
685
314a12dccd20
Cleanups for conflicts with "id" which is a keyword in Objective-C.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
684
diff
changeset
|
5260 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
|
5261 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5262 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
|
5263 [percent setStyle:DWProgressIndicatorStyleBar]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5264 [percent setBezeled:YES]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5265 [percent setMaxValue:100]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5266 [percent setMinValue:0]; |
|
714
cf6246f86c04
Fixed the percent/progress indicators from always being indeterminate.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
713
diff
changeset
|
5267 [percent incrementBy:1]; |
|
cf6246f86c04
Fixed the percent/progress indicators from always being indeterminate.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
713
diff
changeset
|
5268 [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
|
5269 [percent setDoubleValue:0]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5270 /*[percent setTag:cid]; Why doesn't this work? */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5271 return percent; |
|
650
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 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5275 * Sets the percent bar position. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5276 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5277 * 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
|
5278 * 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
|
5279 */ |
|
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
|
5280 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
|
5281 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
|
5282 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
|
5283 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
|
5284 { |
|
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
|
5285 DW_FUNCTION_INIT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5286 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
|
5287 |
|
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
|
5288 /* 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
|
5289 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
|
5290 { |
|
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
|
5291 [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
|
5292 [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
|
5293 } |
|
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
|
5294 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
|
5295 { |
|
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
|
5296 /* 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
|
5297 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
|
5298 { |
|
698875cfe8e5
Fixed the indeterminate percent bar should be animated on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1190
diff
changeset
|
5299 [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
|
5300 [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
|
5301 } |
|
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
|
5302 [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
|
5303 } |
|
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
|
5304 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5305 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5306 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5307 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5308 * 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
|
5309 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5310 * 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
|
5311 * 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
|
5312 */ |
|
685
314a12dccd20
Cleanups for conflicts with "id" which is a keyword in Objective-C.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
684
diff
changeset
|
5313 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
|
5314 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5315 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
|
5316 [button setButtonType:DWButtonTypeSwitch]; |
|
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
5317 [button setBezelStyle:DWBezelStyleRegularSquare]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5318 return button; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5319 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5320 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5321 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5322 * Returns the state of the checkbox. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5323 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5324 * 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
|
5325 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5326 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
|
5327 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5328 DWButton *button = handle; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5329 if([button state]) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5330 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5331 return TRUE; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5332 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5333 return FALSE; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5334 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5335 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5336 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5337 * Sets the state of the checkbox. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5338 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5339 * 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
|
5340 * 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
|
5341 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5342 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
|
5343 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5344 DWButton *button = handle; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5345 if(value) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5346 { |
|
1936
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
5347 [button setState:DWControlStateValueOn]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5348 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5349 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5350 { |
|
1936
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
5351 [button setState:DWControlStateValueOff]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5352 } |
|
656
6c8b95ca877b
Comboboxes implemented.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
655
diff
changeset
|
5353 |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5354 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5355 |
|
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
|
5356 /* 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
|
5357 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
|
5358 { |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
5359 NSScrollView *scrollview = [[NSScrollView alloc] init]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5360 DWContainer *cont = [[DWContainer alloc] init]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
5361 |
|
668
7b99731c6484
Fixes for splitbars (horizontal and vertical definitions are reversed).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
667
diff
changeset
|
5362 [cont setScrollview:scrollview]; |
|
7b99731c6484
Fixes for splitbars (horizontal and vertical definitions are reversed).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
667
diff
changeset
|
5363 [scrollview setBorderType:NSBezelBorder]; |
|
7b99731c6484
Fixes for splitbars (horizontal and vertical definitions are reversed).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
667
diff
changeset
|
5364 [scrollview setHasVerticalScroller:YES]; |
|
7b99731c6484
Fixes for splitbars (horizontal and vertical definitions are reversed).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
667
diff
changeset
|
5365 [scrollview setAutohidesScrollers:YES]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
5366 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5367 if(multi) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5368 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5369 [cont setAllowsMultipleSelection:YES]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5370 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5371 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5372 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5373 [cont setAllowsMultipleSelection:NO]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5374 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5375 [cont setDataSource:cont]; |
|
813
7fa26d8cc8d0
Fix for column click handler not working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
812
diff
changeset
|
5376 [cont setDelegate:cont]; |
|
668
7b99731c6484
Fixes for splitbars (horizontal and vertical definitions are reversed).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
667
diff
changeset
|
5377 [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
|
5378 [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
|
5379 [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
|
5380 [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
|
5381 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
|
5382 } |
|
0502e5b6743b
Haven't finished but the basics of the container/listbox are now working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
657
diff
changeset
|
5383 |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5384 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5385 * 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
|
5386 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5387 * 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
|
5388 * multi: Multiple select TRUE or FALSE. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5389 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5390 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
|
5391 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
|
5392 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
|
5393 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
|
5394 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5395 DW_FUNCTION_INIT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5396 DWContainer *cont = _cont_new(cid, multi); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5397 [cont setHeaderView:nil]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5398 int type = DW_CFA_STRING; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5399 [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
|
5400 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
|
5401 [column setEditable:NO]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5402 [cont addTableColumn:column]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5403 [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
|
5404 DW_FUNCTION_RETURN_THIS(cont) |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5405 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5406 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5407 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5408 * 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
|
5409 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5410 * 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
|
5411 * text: Text to append into listbox. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5412 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5413 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
|
5414 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
|
5415 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
|
5416 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
|
5417 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5418 DW_FUNCTION_INIT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5419 id object = handle; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
5420 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5421 if([object isMemberOfClass:[DWComboBox class]]) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5422 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5423 DWComboBox *combo = handle; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
5424 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5425 [combo addItemWithObjectValue:[ NSString stringWithUTF8String:text ]]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5426 } |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5427 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
|
5428 { |
|
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5429 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
|
5430 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
|
5431 NSArray *newrow = [NSArray arrayWithObject:nstr]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
5432 |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5433 [cont addRow:newrow]; |
|
670
0b920d0dc13e
Implemented bitmap buttons and pixmaps from bundle resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
669
diff
changeset
|
5434 [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
|
5435 [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
|
5436 [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
|
5437 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5438 DW_FUNCTION_RETURN_NOTHING; |
|
650
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 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5442 * 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
|
5443 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5444 * 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
|
5445 * text: Text to insert into listbox. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5446 * 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
|
5447 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5448 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
|
5449 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
|
5450 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
|
5451 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
|
5452 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5453 DW_FUNCTION_INIT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5454 id object = handle; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
5455 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5456 if([object isMemberOfClass:[DWComboBox class]]) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5457 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5458 DWComboBox *combo = handle; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
5459 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5460 [combo insertItemWithObjectValue:[ NSString stringWithUTF8String:text ] atIndex:pos]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5461 } |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5462 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
|
5463 { |
|
687
5dde8d34bc69
Implemented dw_listbox_insert for containers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
686
diff
changeset
|
5464 DWContainer *cont = handle; |
|
5dde8d34bc69
Implemented dw_listbox_insert for containers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
686
diff
changeset
|
5465 NSString *nstr = [ NSString stringWithUTF8String:text ]; |
|
5dde8d34bc69
Implemented dw_listbox_insert for containers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
686
diff
changeset
|
5466 NSArray *newrow = [NSArray arrayWithObject:nstr]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
5467 |
|
687
5dde8d34bc69
Implemented dw_listbox_insert for containers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
686
diff
changeset
|
5468 [cont insertRow:newrow at:pos]; |
|
5dde8d34bc69
Implemented dw_listbox_insert for containers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
686
diff
changeset
|
5469 [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
|
5470 [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
|
5471 [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
|
5472 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5473 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5474 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5475 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5476 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5477 * 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
|
5478 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5479 * 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
|
5480 * 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
|
5481 * 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
|
5482 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5483 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
|
5484 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
|
5485 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
|
5486 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
|
5487 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5488 DW_FUNCTION_INIT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5489 id object = handle; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
5490 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5491 if([object isMemberOfClass:[DWComboBox class]]) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5492 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5493 DWComboBox *combo = handle; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5494 int z; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
5495 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5496 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
|
5497 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5498 [combo addItemWithObjectValue:[ NSString stringWithUTF8String:text[z] ]]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5499 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5500 } |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5501 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
|
5502 { |
|
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5503 DWContainer *cont = handle; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5504 int z; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
5505 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5506 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
|
5507 { |
|
1318
ebd67be26f43
Fixed some issues and deprecations building with Xcode 4.2 on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1314
diff
changeset
|
5508 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
|
5509 NSArray *newrow = [NSArray arrayWithObjects:nstr,nil]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
5510 |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5511 [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
|
5512 } |
|
670
0b920d0dc13e
Implemented bitmap buttons and pixmaps from bundle resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
669
diff
changeset
|
5513 [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
|
5514 [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
|
5515 [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
|
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_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5518 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5519 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5520 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5521 * 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
|
5522 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5523 * 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
|
5524 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5525 DW_FUNCTION_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
|
5526 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
|
5527 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
|
5528 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
|
5529 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5530 DW_FUNCTION_INIT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5531 id object = handle; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
5532 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5533 if([object isMemberOfClass:[DWComboBox class]]) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5534 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5535 DWComboBox *combo = handle; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
5536 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5537 [combo removeAllItems]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5538 } |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5539 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
|
5540 { |
|
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5541 DWContainer *cont = handle; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
5542 |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5543 [cont clear]; |
|
670
0b920d0dc13e
Implemented bitmap buttons and pixmaps from bundle resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
669
diff
changeset
|
5544 [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
|
5545 [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
|
5546 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5547 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5548 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5549 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5550 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5551 * Returns the listbox's item count. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5552 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5553 * 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
|
5554 */ |
|
1955
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_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
|
5556 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
|
5557 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
|
5558 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
|
5559 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5560 DW_FUNCTION_INIT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5561 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
|
5562 int result = 0; |
|
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 if([object isMemberOfClass:[DWComboBox class]]) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5565 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5566 DWComboBox *combo = handle; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
5567 |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5568 result = (int)[combo numberOfItems]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5569 } |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5570 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
|
5571 { |
|
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5572 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
|
5573 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
|
5574 } |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5575 DW_FUNCTION_RETURN_THIS(result); |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5576 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5577 |
|
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 * 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
|
5580 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5581 * 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
|
5582 * top: Index to the top item. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5583 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5584 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
|
5585 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
|
5586 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
|
5587 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
|
5588 { |
|
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_INIT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5590 id object = handle; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
5591 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5592 if([object isMemberOfClass:[DWComboBox class]]) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5593 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5594 DWComboBox *combo = handle; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
5595 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5596 [combo scrollItemAtIndexToTop:top]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5597 } |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5598 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
|
5599 { |
|
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5600 DWContainer *cont = handle; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
5601 |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5602 [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
|
5603 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5604 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5605 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5606 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5607 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5608 * 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
|
5609 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5610 * 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
|
5611 * 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
|
5612 * 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
|
5613 * 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
|
5614 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5615 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
|
5616 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
|
5617 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
|
5618 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
|
5619 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5620 DW_FUNCTION_INIT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5621 id object = handle; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
5622 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5623 if([object isMemberOfClass:[DWComboBox class]]) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5624 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5625 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
|
5626 int count = (int)[combo numberOfItems]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
5627 |
|
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
|
5628 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
|
5629 { |
|
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
|
5630 *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
|
5631 } |
|
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
|
5632 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
|
5633 { |
|
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
|
5634 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
|
5635 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
|
5636 } |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5637 } |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5638 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
|
5639 { |
|
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5640 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
|
5641 int count = (int)[cont numberOfRowsInTableView:cont]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
5642 |
|
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
|
5643 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
|
5644 { |
|
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
|
5645 *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
|
5646 } |
|
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
|
5647 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
|
5648 { |
|
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
|
5649 NSString *nstr = [cont getRow:index and:0]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
5650 |
|
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
|
5651 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
|
5652 } |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5653 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5654 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5655 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5656 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5657 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5658 * 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
|
5659 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5660 * 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
|
5661 * 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
|
5662 * 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
|
5663 */ |
|
1955
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_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
|
5665 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
|
5666 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
|
5667 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
|
5668 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5669 DW_FUNCTION_INIT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5670 id object = handle; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
5671 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5672 if([object isMemberOfClass:[DWComboBox class]]) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5673 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5674 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
|
5675 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
|
5676 |
|
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
|
5677 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
|
5678 { |
|
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
|
5679 [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
|
5680 [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
|
5681 } |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5682 } |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5683 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
|
5684 { |
|
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5685 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
|
5686 int count = (int)[cont numberOfRowsInTableView:cont]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
5687 |
|
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
|
5688 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
|
5689 { |
|
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
|
5690 NSString *nstr = [ NSString stringWithUTF8String:buffer ]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
5691 |
|
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
|
5692 [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
|
5693 [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
|
5694 [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
|
5695 [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
|
5696 } |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5697 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5698 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5699 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5700 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5701 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5702 * 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
|
5703 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5704 * 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
|
5705 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5706 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
|
5707 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
|
5708 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
|
5709 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
|
5710 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5711 DW_FUNCTION_INIT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5712 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
|
5713 int result = -1; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
5714 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5715 if([object isMemberOfClass:[DWComboBox class]]) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5716 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5717 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
|
5718 result = (int)[combo indexOfSelectedItem]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5719 } |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5720 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
|
5721 { |
|
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5722 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
|
5723 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
|
5724 } |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5725 DW_FUNCTION_RETURN_THIS(result); |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5726 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5727 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5728 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5729 * 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
|
5730 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5731 * 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
|
5732 * 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
|
5733 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5734 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
|
5735 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
|
5736 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
|
5737 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
|
5738 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5739 DW_FUNCTION_INIT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5740 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
|
5741 int retval = -1; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
5742 |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5743 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
|
5744 { |
|
981
536ec60ee433
Don't destroy a pixmap if the handle is null
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
980
diff
changeset
|
5745 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
|
5746 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
|
5747 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
|
5748 if( where == -1 ) |
|
536ec60ee433
Don't destroy a pixmap if the handle is null
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
980
diff
changeset
|
5749 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
|
5750 else |
|
536ec60ee433
Don't destroy a pixmap if the handle is null
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
980
diff
changeset
|
5751 result = [selected indexGreaterThanIndex:where]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
5752 |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5753 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
|
5754 { |
|
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5755 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
|
5756 } |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
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_THIS(retval) |
|
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 selection state of a given index. |
|
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 set. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5765 * index: Item index. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5766 * 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
|
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_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
|
5769 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
|
5770 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
|
5771 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
|
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; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5779 if(state) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5780 [combo selectItemAtIndex:index]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5781 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5782 [combo deselectItemAtIndex:index]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5783 } |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5784 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
|
5785 { |
|
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5786 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
|
5787 NSIndexSet *selected = [[NSIndexSet alloc] initWithIndex:(NSUInteger)index]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
5788 |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5789 [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
|
5790 [selected release]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
5791 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5792 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5793 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5794 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5795 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5796 * 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
|
5797 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5798 * 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
|
5799 * index: Item index. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5800 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5801 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
|
5802 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
|
5803 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
|
5804 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
|
5805 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5806 DW_FUNCTION_INIT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5807 id object = handle; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
5808 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5809 if([object isMemberOfClass:[DWComboBox class]]) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5810 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5811 DWComboBox *combo = handle; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
5812 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5813 [combo removeItemAtIndex:index]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5814 } |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5815 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
|
5816 { |
|
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5817 DWContainer *cont = handle; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
5818 |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
5819 [cont removeRow:index]; |
|
670
0b920d0dc13e
Implemented bitmap buttons and pixmaps from bundle resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
669
diff
changeset
|
5820 [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
|
5821 [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
|
5822 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5823 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5824 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5825 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5826 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5827 * 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
|
5828 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5829 * 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
|
5830 * 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
|
5831 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5832 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
|
5833 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
|
5834 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
|
5835 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
|
5836 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5837 DW_FUNCTION_INIT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5838 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
|
5839 [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
|
5840 [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
|
5841 [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
|
5842 DW_FUNCTION_RETURN_THIS(combo) |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5843 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5844 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5845 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5846 * 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
|
5847 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5848 * 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
|
5849 */ |
|
685
314a12dccd20
Cleanups for conflicts with "id" which is a keyword in Objective-C.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
684
diff
changeset
|
5850 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
|
5851 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
5852 DWMLE *mle = [[DWMLE alloc] init]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
5853 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
|
5854 NSSize size = [mle maxSize]; |
|
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
5855 |
|
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
5856 size.width = size.height; |
|
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
5857 [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
|
5858 [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
|
5859 [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
|
5860 [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
|
5861 [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
|
5862 [scrollview setDocumentView:mle]; |
|
1551
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
5863 [mle setVerticallyResizable:YES]; |
|
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
5864 [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
|
5865 [mle setScrollview:scrollview]; |
|
1922
a2a8145f3148
Turn off smart text and quote substitution on MLE.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1914
diff
changeset
|
5866 [mle setAutomaticQuoteSubstitutionEnabled:NO]; |
|
a2a8145f3148
Turn off smart text and quote substitution on MLE.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1914
diff
changeset
|
5867 [mle setAutomaticDashSubstitutionEnabled:NO]; |
|
a2a8145f3148
Turn off smart text and quote substitution on MLE.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1914
diff
changeset
|
5868 [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
|
5869 /* [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
|
5870 [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
|
5871 return mle; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
5872 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5873 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5874 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5875 * 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
|
5876 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5877 * 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
|
5878 * buffer: Text buffer to be imported. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5879 * startpoint: Point to start entering text. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5880 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5881 DW_FUNCTION_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
|
5882 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
|
5883 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
|
5884 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
|
5885 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5886 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
|
5887 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
|
5888 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
|
5889 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
|
5890 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
|
5891 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
|
5892 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
|
5893 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
|
5894 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
|
5895 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
|
5896 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
|
5897 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
|
5898 [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
|
5899 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
|
5900 DW_FUNCTION_RETURN_THIS(retval); |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5901 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5902 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5903 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5904 * Grabs text from an MLE box. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5905 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5906 * 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
|
5907 * buffer: Text buffer to be exported. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5908 * startpoint: Point to start grabbing text. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5909 * 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
|
5910 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5911 DW_FUNCTION_DEFINITION(dw_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
|
5912 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
|
5913 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
|
5914 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
|
5915 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5916 DW_FUNCTION_INIT; |
|
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
|
5917 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
|
5918 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
|
5919 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
|
5920 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
|
5921 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
|
5922 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
|
5923 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5924 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5925 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5926 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5927 * Obtains information about an MLE box. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5928 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5929 * 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
|
5930 * 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
|
5931 * 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
|
5932 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5933 DW_FUNCTION_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
|
5934 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
|
5935 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
|
5936 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
|
5937 { |
|
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_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
|
5939 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
|
5940 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
|
5941 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
|
5942 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
|
5943 |
|
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
|
5944 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
|
5945 *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
|
5946 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
|
5947 { |
|
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
|
5948 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
|
5949 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
|
5950 |
|
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
|
5951 *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
|
5952 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5953 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5954 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5955 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5956 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5957 * Deletes text from an MLE box. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5958 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5959 * 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
|
5960 * startpoint: Point to start deleting text. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5961 * 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
|
5962 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5963 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
|
5964 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
|
5965 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
|
5966 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
|
5967 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5968 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
|
5969 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
|
5970 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
|
5971 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
|
5972 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
|
5973 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
|
5974 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
|
5975 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
|
5976 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
|
5977 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
|
5978 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
|
5979 [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
|
5980 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5981 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5982 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5983 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5984 * 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
|
5985 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5986 * 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
|
5987 */ |
|
1955
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_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
|
5989 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
|
5990 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
|
5991 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
|
5992 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
5993 DW_FUNCTION_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
|
5994 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
|
5995 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
|
5996 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
|
5997 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
|
5998 [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
|
5999 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6000 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6001 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6002 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6003 * 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
|
6004 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6005 * 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
|
6006 * line: Line to be visible. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6007 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6008 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
|
6009 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
|
6010 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
|
6011 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
|
6012 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6013 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
|
6014 DWMLE *mle = handle; |
|
802
676d46b31a11
Initial implementation of dw_mle_set_visible().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
801
diff
changeset
|
6015 NSTextStorage *ts = [mle textStorage]; |
|
676d46b31a11
Initial implementation of dw_mle_set_visible().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
801
diff
changeset
|
6016 NSMutableString *ms = [ts mutableString]; |
|
676d46b31a11
Initial implementation of dw_mle_set_visible().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
801
diff
changeset
|
6017 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
|
6018 |
|
802
676d46b31a11
Initial implementation of dw_mle_set_visible().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
801
diff
changeset
|
6019 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
|
6020 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
|
6021 |
|
802
676d46b31a11
Initial implementation of dw_mle_set_visible().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
801
diff
changeset
|
6022 if(line == numberOfLines) |
|
676d46b31a11
Initial implementation of dw_mle_set_visible().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
801
diff
changeset
|
6023 { |
|
676d46b31a11
Initial implementation of dw_mle_set_visible().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
801
diff
changeset
|
6024 [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
|
6025 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6026 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6027 } |
|
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 * 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
|
6031 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6032 * handle: Handle to the MLE. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6033 * 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
|
6034 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6035 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
|
6036 { |
|
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
|
6037 DWMLE *mle = handle; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6038 if(state) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6039 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6040 [mle setEditable:YES]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6041 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6042 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6043 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6044 [mle setEditable:NO]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6045 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6046 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6047 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6048 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6049 * 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
|
6050 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6051 * handle: Handle to the MLE. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6052 * 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
|
6053 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6054 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
|
6055 { |
|
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
|
6056 DWMLE *mle = handle; |
|
1551
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
6057 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
|
6058 |
|
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
|
6059 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
|
6060 { |
|
1551
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
6061 [[mle textContainer] setWidthTracksTextView:YES]; |
|
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
6062 [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
|
6063 } |
|
48f8efba898f
Filled in most of the remaining MLE and container functions... the remaining few
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
674
diff
changeset
|
6064 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
|
6065 { |
|
1551
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
6066 [[mle textContainer] setWidthTracksTextView:NO]; |
|
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
6067 [[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
|
6068 [mle setHorizontallyResizable:YES]; |
|
1551
cf897886ceeb
Fixed disabling word wrap in the MLE on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1549
diff
changeset
|
6069 [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
|
6070 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6071 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6072 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6073 /* |
|
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
|
6074 * 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
|
6075 * 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
|
6076 * 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
|
6077 * 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
|
6078 */ |
|
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
|
6079 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
|
6080 { |
|
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
|
6081 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
|
6082 [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
|
6083 [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
|
6084 [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
|
6085 } |
|
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
|
6086 |
|
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
|
6087 /* |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6088 * 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
|
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 positioned. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6091 * point: Point to position cursor. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6092 */ |
|
1955
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_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
|
6094 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
|
6095 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
|
6096 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
|
6097 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6098 DW_FUNCTION_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
|
6099 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
|
6100 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
|
6101 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
|
6102 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
|
6103 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
|
6104 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
|
6105 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
|
6106 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
|
6107 [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
|
6108 [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
|
6109 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6110 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6111 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6112 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6113 * Finds text in an MLE box. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6114 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6115 * handle: Handle to the MLE to be cleared. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6116 * text: Text to search for. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6117 * point: Start point of search. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6118 * flags: Search specific flags. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6119 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6120 DW_FUNCTION_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
|
6121 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
|
6122 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
|
6123 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
|
6124 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6125 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
|
6126 DWMLE *mle = handle; |
|
888
cd6ff038e38b
Implemented dw_mle_search on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
887
diff
changeset
|
6127 NSTextStorage *ts = [mle textStorage]; |
|
cd6ff038e38b
Implemented dw_mle_search on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
887
diff
changeset
|
6128 NSMutableString *ms = [ts mutableString]; |
|
cd6ff038e38b
Implemented dw_mle_search on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
887
diff
changeset
|
6129 NSString *searchForMe = [NSString stringWithUTF8String:text]; |
|
cd6ff038e38b
Implemented dw_mle_search on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
887
diff
changeset
|
6130 NSRange searchRange = NSMakeRange(point, [ms length] - point); |
|
cd6ff038e38b
Implemented dw_mle_search on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
887
diff
changeset
|
6131 NSRange range = NSMakeRange(NSNotFound, 0); |
|
cd6ff038e38b
Implemented dw_mle_search on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
887
diff
changeset
|
6132 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
|
6133 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
|
6134 |
|
888
cd6ff038e38b
Implemented dw_mle_search on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
887
diff
changeset
|
6135 if(ms) |
|
cd6ff038e38b
Implemented dw_mle_search on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
887
diff
changeset
|
6136 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
|
6137 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
|
6138 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
|
6139 DW_FUNCTION_RETURN_THIS(retval); |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6140 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6141 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6142 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6143 * Stops redrawing of an MLE box. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6144 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6145 * 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
|
6146 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6147 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
|
6148 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6149 /* 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
|
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 * Resumes redrawing 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 to thaw. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6156 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6157 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
|
6158 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6159 /* 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
|
6160 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6161 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6162 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6163 * 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
|
6164 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6165 * 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
|
6166 * 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
|
6167 */ |
|
685
314a12dccd20
Cleanups for conflicts with "id" which is a keyword in Objective-C.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
684
diff
changeset
|
6168 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
|
6169 { |
|
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
|
6170 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
|
6171 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
|
6172 |
|
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
|
6173 [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
|
6174 //[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
|
6175 [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
|
6176 [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
|
6177 [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
|
6178 [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
|
6179 [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
|
6180 [[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
|
6181 return border; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6182 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6183 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6184 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6185 * 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
|
6186 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6187 * 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
|
6188 * 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
|
6189 */ |
|
685
314a12dccd20
Cleanups for conflicts with "id" which is a keyword in Objective-C.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
684
diff
changeset
|
6190 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
|
6191 { |
|
1564
d84a690448c3
Attempted fix at border calculation on Mac for status text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1559
diff
changeset
|
6192 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
|
6193 [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
|
6194 [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
|
6195 [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
|
6196 [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
|
6197 [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
|
6198 [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
|
6199 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
|
6200 { |
|
9882b0dfa304
Added an internal Mac function for setting the default Dynamic Windows font.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
743
diff
changeset
|
6201 [[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
|
6202 } |
|
1712
daa59fc8d6e5
Disable wrapping on entryfields and static text on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1709
diff
changeset
|
6203 [[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
|
6204 return textfield; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6205 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6206 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6207 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6208 * 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
|
6209 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6210 * 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
|
6211 * Returns: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6212 * 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
|
6213 */ |
|
685
314a12dccd20
Cleanups for conflicts with "id" which is a keyword in Objective-C.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
684
diff
changeset
|
6214 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
|
6215 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6216 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
|
6217 [render setTag:cid]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6218 return render; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6219 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6220 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6221 /* Sets the current foreground drawing color. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6222 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6223 * red: red value. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6224 * green: green value. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6225 * blue: blue value. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6226 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6227 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
|
6228 { |
|
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
|
6229 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
|
6230 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
|
6231 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
|
6232 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6233 _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
|
6234 |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
6235 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
|
6236 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
|
6237 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
|
6238 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
|
6239 [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
|
6240 DW_LOCAL_POOL_OUT; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6241 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6242 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6243 /* Sets the current background drawing color. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6244 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6245 * red: red value. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6246 * green: green value. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6247 * blue: blue value. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6248 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6249 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
|
6250 { |
|
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
|
6251 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
|
6252 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
|
6253 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
|
6254 |
|
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
|
6255 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
|
6256 { |
|
3774af45eb0c
Fix for dw_draw_text() not using the background color on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
890
diff
changeset
|
6257 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
|
6258 } |
|
3774af45eb0c
Fix for dw_draw_text() not using the background color on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
890
diff
changeset
|
6259 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
|
6260 { |
|
3774af45eb0c
Fix for dw_draw_text() not using the background color on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
890
diff
changeset
|
6261 _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
|
6262 |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
6263 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
|
6264 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
|
6265 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
|
6266 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
|
6267 } |
|
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
|
6268 [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
|
6269 DW_LOCAL_POOL_OUT; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6270 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6271 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6272 /* 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
|
6273 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6274 * value: current color |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6275 * Returns: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6276 * 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
|
6277 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6278 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
|
6279 { |
|
732
db3a173e487e
Fixes for the color chooser... it now works a single time. However...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
731
diff
changeset
|
6280 /* 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
|
6281 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
|
6282 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
|
6283 DW_LOCAL_POOL_IN; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
6284 |
|
1644
2b55465887e1
Color chooser changes for Lion compatibility on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1610
diff
changeset
|
6285 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
|
6286 { |
|
733
8d5e5b89725f
Fixed the crashing issue with dw_color_choose() it now functions properly.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
732
diff
changeset
|
6287 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
|
6288 /* 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
|
6289 [colorDlg setContinuous:NO]; |
|
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
6290 [colorDlg setTarget:colorDlg]; |
|
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
6291 [colorDlg setAction:@selector(changeColor:)]; |
|
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
6292 } |
|
1644
2b55465887e1
Color chooser changes for Lion compatibility on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1610
diff
changeset
|
6293 else |
|
2b55465887e1
Color chooser changes for Lion compatibility on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1610
diff
changeset
|
6294 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
|
6295 |
|
1644
2b55465887e1
Color chooser changes for Lion compatibility on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1610
diff
changeset
|
6296 /* 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
|
6297 if([colorDlg dialog]) |
|
2b55465887e1
Color chooser changes for Lion compatibility on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1610
diff
changeset
|
6298 { |
|
2b55465887e1
Color chooser changes for Lion compatibility on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1610
diff
changeset
|
6299 DW_LOCAL_POOL_OUT; |
|
2b55465887e1
Color chooser changes for Lion compatibility on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1610
diff
changeset
|
6300 return value; |
|
2b55465887e1
Color chooser changes for Lion compatibility on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1610
diff
changeset
|
6301 } |
|
2b55465887e1
Color chooser changes for Lion compatibility on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1610
diff
changeset
|
6302 |
|
2b55465887e1
Color chooser changes for Lion compatibility on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1610
diff
changeset
|
6303 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
|
6304 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
|
6305 [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
|
6306 |
|
733
8d5e5b89725f
Fixed the crashing issue with dw_color_choose() it now functions properly.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
732
diff
changeset
|
6307 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
|
6308 [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
|
6309 [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
|
6310 |
|
732
db3a173e487e
Fixes for the color chooser... it now works a single time. However...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
731
diff
changeset
|
6311 /* 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
|
6312 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
|
6313 |
|
732
db3a173e487e
Fixes for the color chooser... it now works a single time. However...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
731
diff
changeset
|
6314 /* 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
|
6315 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
|
6316 [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
|
6317 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
|
6318 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
|
6319 return value; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6320 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6321 |
|
1938
5a88fff43d99
Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1936
diff
changeset
|
6322 /* 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
|
6323 * 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
|
6324 */ |
|
5a88fff43d99
Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1936
diff
changeset
|
6325 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
|
6326 { |
|
5a88fff43d99
Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1936
diff
changeset
|
6327 #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
|
6328 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
|
6329 #else |
|
5a88fff43d99
Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1936
diff
changeset
|
6330 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
|
6331 #endif |
|
5a88fff43d99
Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1936
diff
changeset
|
6332 } |
|
5a88fff43d99
Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1936
diff
changeset
|
6333 |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6334 /* 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
|
6335 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6336 * handle: Handle to the window. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6337 * 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
|
6338 * x: X coordinate. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6339 * y: Y coordinate. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6340 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6341 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
|
6342 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
|
6343 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
|
6344 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
|
6345 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6346 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
|
6347 DW_LOCAL_POOL_IN; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6348 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
|
6349 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
|
6350 bool bCanDraw = 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
|
6351 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6352 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
|
6353 bi = image = (id)pixmap->image; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6354 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6355 { |
|
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
|
6356 #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
|
6357 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
|
6358 { |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6359 DWRender *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
|
6360 |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6361 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
|
6362 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6363 #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
|
6364 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
|
6365 _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
|
6366 #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
|
6367 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6368 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
|
6369 { |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6370 [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
|
6371 [NSGraphicsContext setCurrentContext:_dw_draw_context(bi)]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6372 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6373 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
|
6374 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6375 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
|
6376 [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
|
6377 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
|
6378 [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
|
6379 |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6380 [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
|
6381 [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
|
6382 } |
|
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
|
6383 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
|
6384 [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
|
6385 #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
|
6386 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
|
6387 [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
|
6388 #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
|
6389 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
|
6390 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6391 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6392 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6393 /* 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
|
6394 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6395 * handle: Handle to the window. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6396 * 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
|
6397 * x1: First X coordinate. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6398 * y1: First Y coordinate. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6399 * x2: Second X coordinate. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6400 * y2: Second Y coordinate. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6401 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6402 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
|
6403 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
|
6404 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
|
6405 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
|
6406 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6407 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
|
6408 DW_LOCAL_POOL_IN; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6409 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
|
6410 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
|
6411 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
|
6412 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6413 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
|
6414 bi = image = (id)pixmap->image; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6415 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6416 { |
|
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
|
6417 #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
|
6418 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
|
6419 { |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6420 DWRender *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
|
6421 |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6422 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
|
6423 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6424 #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
|
6425 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
|
6426 _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
|
6427 #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
|
6428 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6429 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
|
6430 { |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6431 [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
|
6432 [NSGraphicsContext setCurrentContext:_dw_draw_context(bi)]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6433 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6434 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
|
6435 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6436 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
|
6437 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
|
6438 [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
|
6439 |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6440 [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
|
6441 [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
|
6442 [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
|
6443 } |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
6444 |
|
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
|
6445 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
|
6446 [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
|
6447 #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
|
6448 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
|
6449 [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
|
6450 #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
|
6451 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
|
6452 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6453 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6454 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6455 /* 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
|
6456 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6457 * handle: Handle to the window. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6458 * 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
|
6459 * x: X coordinate. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6460 * y: Y coordinate. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6461 * text: Text to be displayed. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6462 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6463 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
|
6464 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
|
6465 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
|
6466 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
|
6467 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6468 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
|
6469 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
|
6470 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
|
6471 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
|
6472 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
|
6473 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
|
6474 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
|
6475 bool bCanDraw = 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
|
6476 |
|
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
|
6477 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
|
6478 { |
|
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
|
6479 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
|
6480 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
|
6481 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
|
6482 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
|
6483 { |
|
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
|
6484 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
|
6485 } |
|
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
|
6486 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
|
6487 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6488 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
|
6489 { |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6490 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
|
6491 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
|
6492 #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
|
6493 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
|
6494 #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
|
6495 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
|
6496 _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
|
6497 #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
|
6498 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6499 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
|
6500 { |
|
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
|
6501 [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
|
6502 [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
|
6503 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6504 |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6505 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
|
6506 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6507 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
|
6508 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
|
6509 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
|
6510 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
|
6511 [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
|
6512 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
|
6513 [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
|
6514 [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
|
6515 [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
|
6516 } |
|
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
|
6517 |
|
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 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
|
6519 [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
|
6520 #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
|
6521 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
|
6522 [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
|
6523 #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
|
6524 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
|
6525 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6526 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6527 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6528 /* 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
|
6529 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6530 * handle: Handle to the window. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6531 * 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
|
6532 * text: Text to be queried. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6533 * 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
|
6534 * 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
|
6535 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6536 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
|
6537 { |
|
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
|
6538 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
|
6539 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
|
6540 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
|
6541 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
|
6542 |
|
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
|
6543 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
|
6544 |
|
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
|
6545 /* 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
|
6546 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
|
6547 { |
|
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
|
6548 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
|
6549 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
|
6550 } |
|
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
|
6551 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
|
6552 /* 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
|
6553 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
|
6554 { |
|
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
|
6555 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
|
6556 } |
|
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
|
6557 /* 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
|
6558 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
|
6559 { |
|
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
|
6560 [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
|
6561 } |
|
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
|
6562 /* 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
|
6563 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
|
6564 [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
|
6565 /* 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
|
6566 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
|
6567 { |
|
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
|
6568 *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
|
6569 } |
|
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
|
6570 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
|
6571 { |
|
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
|
6572 *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
|
6573 } |
|
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
|
6574 DW_LOCAL_POOL_OUT; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6575 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6576 |
|
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
|
6577 /* 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
|
6578 * 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
|
6579 */ |
|
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
|
6580 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
|
6581 { |
|
1938
5a88fff43d99
Mac: Fixed deprecation warnings relating to the GraphicsPort now using CoreGraphics.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1936
diff
changeset
|
6582 #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
|
6583 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
|
6584 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
|
6585 #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
|
6586 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
|
6587 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
|
6588 #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
|
6589 [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
|
6590 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
|
6591 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
|
6592 } |
|
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
|
6593 |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6594 /* 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
|
6595 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6596 * handle: Handle to the window. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6597 * 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
|
6598 * 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
|
6599 * x: X coordinate. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6600 * y: Y coordinate. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6601 * width: Width of rectangle. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6602 * height: Height of rectangle. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6603 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6604 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
|
6605 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
|
6606 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
|
6607 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
|
6608 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6609 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
|
6610 DW_LOCAL_POOL_IN; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6611 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
|
6612 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
|
6613 bool bCanDraw = YES; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6614 int z; |
|
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
|
6615 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6616 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
|
6617 bi = image = (id)pixmap->image; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6618 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6619 { |
|
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
|
6620 #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
|
6621 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
|
6622 { |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6623 DWRender *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
|
6624 |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6625 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
|
6626 } |
|
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 #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
|
6628 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
|
6629 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6630 _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
|
6631 [[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
|
6632 } |
|
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
|
6633 #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
|
6634 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6635 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
|
6636 { |
|
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
|
6637 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
|
6638 [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
|
6639 [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
|
6640 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6641 |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6642 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
|
6643 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6644 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
|
6645 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
|
6646 [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
|
6647 |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6648 [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
|
6649 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
|
6650 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6651 [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
|
6652 } |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6653 [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
|
6654 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
|
6655 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6656 [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
|
6657 } |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6658 [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
|
6659 } |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6660 |
|
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
|
6661 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
|
6662 [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
|
6663 #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
|
6664 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
|
6665 [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
|
6666 #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
|
6667 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
|
6668 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6669 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6670 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6671 /* 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
|
6672 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6673 * handle: Handle to the window. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6674 * 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
|
6675 * 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
|
6676 * x: X coordinate. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6677 * y: Y coordinate. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6678 * width: Width of rectangle. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6679 * height: Height of rectangle. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6680 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6681 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
|
6682 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
|
6683 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
|
6684 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
|
6685 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6686 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
|
6687 DW_LOCAL_POOL_IN; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6688 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
|
6689 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
|
6690 bool bCanDraw = 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
|
6691 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6692 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
|
6693 bi = image = (id)pixmap->image; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6694 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6695 { |
|
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
|
6696 #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
|
6697 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
|
6698 { |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6699 DWRender *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
|
6700 |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6701 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
|
6702 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6703 #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
|
6704 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
|
6705 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6706 _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
|
6707 [[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
|
6708 } |
|
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
|
6709 #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
|
6710 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6711 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
|
6712 { |
|
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
|
6713 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
|
6714 [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
|
6715 [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
|
6716 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6717 |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6718 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
|
6719 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6720 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
|
6721 [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
|
6722 |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6723 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
|
6724 [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
|
6725 else |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6726 [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
|
6727 } |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
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 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
|
6730 [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
|
6731 #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
|
6732 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
|
6733 [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
|
6734 #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
|
6735 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
|
6736 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6737 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6738 |
|
1261
61d0c5f84644
Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1247
diff
changeset
|
6739 /* 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
|
6740 * Parameters: |
|
61d0c5f84644
Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1247
diff
changeset
|
6741 * 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
|
6742 * 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
|
6743 * 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
|
6744 * 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
|
6745 * 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
|
6746 * 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
|
6747 * 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
|
6748 * 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
|
6749 * 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
|
6750 * 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
|
6751 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6752 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
|
6753 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
|
6754 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
|
6755 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
|
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 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
|
6758 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
|
6759 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
|
6760 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
|
6761 bool bCanDraw = 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
|
6762 |
|
1261
61d0c5f84644
Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1247
diff
changeset
|
6763 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
|
6764 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
|
6765 else |
|
61d0c5f84644
Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1247
diff
changeset
|
6766 { |
|
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 #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
|
6768 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
|
6769 { |
|
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 DWRender *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
|
6771 |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6772 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
|
6773 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6774 #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
|
6775 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
|
6776 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6777 _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
|
6778 [[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
|
6779 } |
|
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
|
6780 #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
|
6781 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6782 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
|
6783 { |
|
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
|
6784 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
|
6785 [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
|
6786 [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
|
6787 } |
|
42f1e323849c
Mac: Massive rewrite to the drawing code in an attempt to get NSView
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1945
diff
changeset
|
6788 |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6789 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
|
6790 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6791 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
|
6792 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
|
6793 [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
|
6794 |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6795 /* 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
|
6796 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
|
6797 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6798 [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
|
6799 } |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6800 else |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6801 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6802 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
|
6803 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
|
6804 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
|
6805 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
|
6806 double r = sqrt(dx*dx + dy*dy); |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6807 |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6808 /* 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
|
6809 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
|
6810 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
|
6811 |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6812 /* 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
|
6813 [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
|
6814 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
|
6815 } |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6816 /* 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
|
6817 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
|
6818 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6819 [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
|
6820 } |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6821 /* 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
|
6822 [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
|
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 |
|
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
|
6825 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
|
6826 [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
|
6827 #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
|
6828 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
|
6829 [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
|
6830 #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
|
6831 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
|
6832 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
|
6833 } |
|
61d0c5f84644
Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1247
diff
changeset
|
6834 |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6835 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6836 * 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
|
6837 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6838 * 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
|
6839 * resource file. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6840 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6841 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
|
6842 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
|
6843 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
|
6844 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
|
6845 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6846 DW_FUNCTION_INIT; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
6847 NSScrollView *scrollview = [[NSScrollView alloc] init]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6848 DWTree *tree = [[DWTree alloc] init]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
6849 |
|
680
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
6850 [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
|
6851 [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
|
6852 [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
|
6853 [scrollview setAutohidesScrollers:YES]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
6854 |
|
680
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
6855 [tree setAllowsMultipleSelection:NO]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
6856 [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
|
6857 [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
|
6858 [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
|
6859 [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
|
6860 [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
|
6861 [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
|
6862 DW_FUNCTION_RETURN_THIS(tree); |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6863 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6864 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6865 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6866 * 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
|
6867 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6868 * 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
|
6869 * 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
|
6870 * 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
|
6871 * icon: Handle to coresponding icon. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6872 * 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
|
6873 * itemdata: Item specific data. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6874 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6875 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
|
6876 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
|
6877 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
|
6878 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
|
6879 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6880 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
|
6881 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
|
6882 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
|
6883 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
|
6884 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
|
6885 [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
|
6886 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
|
6887 [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
|
6888 [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
|
6889 [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
|
6890 [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
|
6891 [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
|
6892 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
|
6893 [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
|
6894 else |
|
2ebaea72ac95
Fix for some release calls causing issues on MacOS 10.7 Lion.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1061
diff
changeset
|
6895 [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
|
6896 DW_FUNCTION_RETURN_THIS(treenode); |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6897 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6898 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6899 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6900 * 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
|
6901 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6902 * 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
|
6903 * 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
|
6904 * icon: Handle to coresponding icon. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6905 * 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
|
6906 * itemdata: Item specific data. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6907 */ |
|
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
|
6908 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
|
6909 { |
|
680
db315779a283
Initial tree support, lots more to do but basics are there.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
679
diff
changeset
|
6910 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
|
6911 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6912 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6913 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6914 * 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
|
6915 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6916 * 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
|
6917 * 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
|
6918 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6919 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
|
6920 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
|
6921 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
|
6922 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
|
6923 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6924 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
|
6925 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
|
6926 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
|
6927 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
|
6928 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
|
6929 DW_FUNCTION_RETURN_THIS(retval); |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6930 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6931 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6932 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6933 * 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
|
6934 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6935 * 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
|
6936 * 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
|
6937 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6938 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
|
6939 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
|
6940 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
|
6941 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
|
6942 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6943 DW_FUNCTION_INIT; |
|
881
7b2750744552
Implemented dw_tree_get_parent() for the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
873
diff
changeset
|
6944 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
|
6945 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
|
6946 |
|
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
|
6947 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
|
6948 DW_FUNCTION_RETURN_THIS(parent); |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6949 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6950 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6951 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6952 * 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
|
6953 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6954 * 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
|
6955 * 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
|
6956 * 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
|
6957 * icon: Handle to coresponding icon. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6958 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6959 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
|
6960 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
|
6961 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
|
6962 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
|
6963 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6964 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
|
6965 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
|
6966 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
|
6967 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
|
6968 |
|
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
|
6969 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
|
6970 { |
|
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
|
6971 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
|
6972 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
|
6973 [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
|
6974 [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
|
6975 } |
|
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
|
6976 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
|
6977 { |
|
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
|
6978 [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
|
6979 } |
|
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
|
6980 [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
|
6981 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
|
6982 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6983 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6984 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6985 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6986 * 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
|
6987 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6988 * 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
|
6989 * 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
|
6990 * 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
|
6991 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6992 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
|
6993 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
|
6994 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
|
6995 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
|
6996 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
6997 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
|
6998 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
|
6999 [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
|
7000 DW_FUNCTION_RETURN_NOTHING; |
|
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 * 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
|
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 containing the item. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7007 * 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
|
7008 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7009 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
|
7010 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
|
7011 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
|
7012 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
|
7013 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7014 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
|
7015 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
|
7016 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
|
7017 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
|
7018 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
|
7019 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
|
7020 DW_FUNCTION_RETURN_THIS(result); |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7021 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7022 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7023 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7024 * 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
|
7025 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7026 * handle: Handle to the tree window (widget) to be selected. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7027 * 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
|
7028 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7029 DW_FUNCTION_DEFINITION(dw_tree_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
|
7030 DW_FUNCTION_ADD_PARAM2(handle, item) |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7031 DW_FUNCTION_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
|
7032 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
|
7033 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7034 DW_FUNCTION_INIT; |
|
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
|
7035 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
|
7036 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
|
7037 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
|
7038 { |
|
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
|
7039 [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
|
7040 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7041 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7042 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7043 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7044 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7045 * Removes all nodes from a tree. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7046 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7047 * 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
|
7048 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7049 DW_FUNCTION_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
|
7050 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
|
7051 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
|
7052 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
|
7053 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7054 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
|
7055 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
|
7056 [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
|
7057 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7058 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7059 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7060 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7061 * Expands a node on a tree. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7062 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7063 * 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
|
7064 * 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
|
7065 */ |
|
1955
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_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
|
7067 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
|
7068 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
|
7069 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
|
7070 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7071 DW_FUNCTION_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
|
7072 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
|
7073 [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
|
7074 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7075 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7076 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7077 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7078 * Collapses a node on a tree. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7079 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7080 * 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
|
7081 * 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
|
7082 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7083 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
|
7084 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
|
7085 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
|
7086 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
|
7087 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7088 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
|
7089 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
|
7090 [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
|
7091 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7092 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7093 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7094 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7095 * Removes a node from a tree. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7096 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7097 * 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
|
7098 * 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
|
7099 */ |
|
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 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
|
7101 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
|
7102 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
|
7103 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
|
7104 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7105 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
|
7106 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
|
7107 [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
|
7108 [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
|
7109 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7110 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7111 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7112 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7113 * 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
|
7114 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7115 * 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
|
7116 * resource file. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7117 */ |
|
1955
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_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
|
7119 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
|
7120 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
|
7121 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
|
7122 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7123 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
|
7124 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
|
7125 NSScrollView *scrollview = [cont scrollview]; |
|
7b99731c6484
Fixes for splitbars (horizontal and vertical definitions are reversed).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
667
diff
changeset
|
7126 [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
|
7127 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
|
7128 [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
|
7129 [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
|
7130 [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
|
7131 DW_FUNCTION_RETURN_THIS(cont); |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7132 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7133 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7134 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7135 * Sets up the container columns. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7136 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7137 * 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
|
7138 * 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
|
7139 * 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
|
7140 * 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
|
7141 * 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
|
7142 * (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
|
7143 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7144 DW_FUNCTION_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
|
7145 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
|
7146 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
|
7147 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
|
7148 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7149 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
|
7150 int z, retval = DW_ERROR_NONE; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7151 DWContainer *cont = handle; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
7152 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7153 [cont setup]; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
7154 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7155 for(z=0;z<count;z++) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7156 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7157 NSTableColumn *column = [[NSTableColumn alloc] init]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7158 [[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
|
7159 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
|
7160 { |
|
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
|
7161 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
|
7162 [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
|
7163 [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
|
7164 } |
|
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
|
7165 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
|
7166 { |
|
1206
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
7167 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
|
7168 [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
|
7169 [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
|
7170 } |
|
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
|
7171 /* 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
|
7172 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
|
7173 { |
|
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
|
7174 [(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
|
7175 [(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
|
7176 } |
|
3872ab37297b
Fix numerous deprecation warnings building with SDK 10.12 Sierra.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1908
diff
changeset
|
7177 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
|
7178 { |
|
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
|
7179 [(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
|
7180 [(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
|
7181 } |
|
795
f23cad02cfb3
Make listbox, container and tree cells uneditable.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
794
diff
changeset
|
7182 [column setEditable:NO]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7183 [cont addTableColumn:column]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7184 [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
|
7185 [column release]; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
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_RETURN_THIS(retval); |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7188 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7189 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7190 /* |
|
1744
535e8c19a13d
Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1740
diff
changeset
|
7191 * 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
|
7192 * Parameters: |
|
535e8c19a13d
Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1740
diff
changeset
|
7193 * 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
|
7194 * 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
|
7195 */ |
|
535e8c19a13d
Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1740
diff
changeset
|
7196 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
|
7197 { |
|
535e8c19a13d
Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1740
diff
changeset
|
7198 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
|
7199 |
|
535e8c19a13d
Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1740
diff
changeset
|
7200 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
|
7201 } |
|
535e8c19a13d
Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1740
diff
changeset
|
7202 |
|
535e8c19a13d
Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1740
diff
changeset
|
7203 /* |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7204 * 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
|
7205 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7206 * 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
|
7207 * 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
|
7208 * 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
|
7209 * 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
|
7210 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7211 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
|
7212 { |
|
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
|
7213 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
|
7214 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
|
7215 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
|
7216 DWContainer *cont = handle; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
7217 |
|
1744
535e8c19a13d
Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1740
diff
changeset
|
7218 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
|
7219 |
|
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
|
7220 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
|
7221 |
|
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
|
7222 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
|
7223 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
|
7224 |
|
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
|
7225 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
|
7226 [cont setFilesystem:YES]; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
7227 |
|
1744
535e8c19a13d
Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1740
diff
changeset
|
7228 if(coltitle) |
|
535e8c19a13d
Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1740
diff
changeset
|
7229 { |
|
535e8c19a13d
Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1740
diff
changeset
|
7230 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
|
7231 free(coltitle); |
|
535e8c19a13d
Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1740
diff
changeset
|
7232 } |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7233 free(newtitles); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7234 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
|
7235 return DW_ERROR_NONE; |
|
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 * 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
|
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 window (widget). |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7242 * 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
|
7243 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7244 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
|
7245 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
|
7246 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
|
7247 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
|
7248 { |
|
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_INIT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7250 DWContainer *cont = handle; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7251 [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
|
7252 DW_FUNCTION_RETURN_THIS(cont); |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7253 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7254 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7255 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7256 * 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
|
7257 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7258 * 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
|
7259 * 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
|
7260 * 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
|
7261 * 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
|
7262 * 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
|
7263 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7264 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
|
7265 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
|
7266 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
|
7267 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
|
7268 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7269 DW_FUNCTION_INIT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7270 DWContainer *cont = handle; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7271 id object = nil; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7272 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
|
7273 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
|
7274 |
|
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
|
7275 /* 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
|
7276 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
|
7277 { |
|
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
|
7278 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
|
7279 } |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
7280 |
|
1502
dc41efe8a53f
Allow passing NULL to dw_container_change/set_item() APIs on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1498
diff
changeset
|
7281 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
|
7282 { |
|
dc41efe8a53f
Allow passing NULL to dw_container_change/set_item() APIs on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1498
diff
changeset
|
7283 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
|
7284 { |
|
dc41efe8a53f
Allow passing NULL to dw_container_change/set_item() APIs on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1498
diff
changeset
|
7285 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
|
7286 } |
|
dc41efe8a53f
Allow passing NULL to dw_container_change/set_item() APIs on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1498
diff
changeset
|
7287 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
|
7288 { |
|
dc41efe8a53f
Allow passing NULL to dw_container_change/set_item() APIs on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1498
diff
changeset
|
7289 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
|
7290 object = [ NSString stringWithUTF8String:str ]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7291 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7292 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7293 { |
|
1502
dc41efe8a53f
Allow passing NULL to dw_container_change/set_item() APIs on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1498
diff
changeset
|
7294 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
|
7295 |
|
1502
dc41efe8a53f
Allow passing NULL to dw_container_change/set_item() APIs on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1498
diff
changeset
|
7296 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
|
7297 { |
|
dc41efe8a53f
Allow passing NULL to dw_container_change/set_item() APIs on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1498
diff
changeset
|
7298 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
|
7299 |
|
1502
dc41efe8a53f
Allow passing NULL to dw_container_change/set_item() APIs on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1498
diff
changeset
|
7300 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
|
7301 } |
|
dc41efe8a53f
Allow passing NULL to dw_container_change/set_item() APIs on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1498
diff
changeset
|
7302 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
|
7303 { |
|
dc41efe8a53f
Allow passing NULL to dw_container_change/set_item() APIs on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1498
diff
changeset
|
7304 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
|
7305 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
|
7306 |
|
1502
dc41efe8a53f
Allow passing NULL to dw_container_change/set_item() APIs on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1498
diff
changeset
|
7307 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
|
7308 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
|
7309 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
|
7310 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
|
7311 |
|
1502
dc41efe8a53f
Allow passing NULL to dw_container_change/set_item() APIs on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1498
diff
changeset
|
7312 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
|
7313 } |
|
dc41efe8a53f
Allow passing NULL to dw_container_change/set_item() APIs on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1498
diff
changeset
|
7314 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
|
7315 { |
|
dc41efe8a53f
Allow passing NULL to dw_container_change/set_item() APIs on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1498
diff
changeset
|
7316 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
|
7317 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
|
7318 |
|
1502
dc41efe8a53f
Allow passing NULL to dw_container_change/set_item() APIs on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1498
diff
changeset
|
7319 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
|
7320 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
|
7321 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
|
7322 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
|
7323 |
|
1502
dc41efe8a53f
Allow passing NULL to dw_container_change/set_item() APIs on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1498
diff
changeset
|
7324 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
|
7325 } |
|
dc41efe8a53f
Allow passing NULL to dw_container_change/set_item() APIs on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1498
diff
changeset
|
7326 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
|
7327 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
|
7328 } |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7329 } |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
7330 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7331 [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
|
7332 [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
|
7333 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7334 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7335 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7336 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7337 * 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
|
7338 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7339 * 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
|
7340 * 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
|
7341 * 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
|
7342 * 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
|
7343 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7344 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
|
7345 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7346 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
|
7347 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7348 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7349 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7350 * 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
|
7351 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7352 * 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
|
7353 * 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
|
7354 * 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
|
7355 * 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
|
7356 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7357 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
|
7358 { |
|
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
|
7359 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
|
7360 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7361 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7362 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7363 * 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
|
7364 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7365 * 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
|
7366 * 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
|
7367 * 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
|
7368 * 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
|
7369 * 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
|
7370 */ |
|
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
|
7371 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
|
7372 { |
|
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
|
7373 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
|
7374 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7375 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7376 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7377 * 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
|
7378 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7379 * 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
|
7380 * 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
|
7381 * 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
|
7382 * 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
|
7383 * 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
|
7384 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7385 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
|
7386 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
|
7387 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
|
7388 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
|
7389 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7390 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
|
7391 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
|
7392 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
|
7393 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
|
7394 |
|
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
|
7395 /* 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
|
7396 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
|
7397 { |
|
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
|
7398 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
|
7399 } |
|
938
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
7400 |
|
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
|
7401 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
|
7402 [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
|
7403 [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
|
7404 [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
|
7405 [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
|
7406 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7407 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7408 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7409 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7410 * 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
|
7411 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7412 * 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
|
7413 * 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
|
7414 * 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
|
7415 * 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
|
7416 * 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
|
7417 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7418 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
|
7419 { |
|
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
|
7420 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
|
7421 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7422 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7423 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7424 * 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
|
7425 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7426 * 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
|
7427 * column: Zero based column. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7428 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7429 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
|
7430 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
|
7431 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
|
7432 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
|
7433 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7434 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
|
7435 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
|
7436 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
|
7437 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
|
7438 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
|
7439 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
|
7440 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
|
7441 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
|
7442 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
|
7443 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
|
7444 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
|
7445 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
|
7446 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
|
7447 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
|
7448 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
|
7449 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
|
7450 DW_FUNCTION_RETURN_THIS(rc); |
|
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 * 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
|
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. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7458 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7459 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
|
7460 { |
|
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
|
7461 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
|
7462 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7463 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7464 /* |
|
1206
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
7465 * 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
|
7466 * Parameters: |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
7467 * 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
|
7468 * 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
|
7469 * 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
|
7470 * 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
|
7471 * 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
|
7472 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7473 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
|
7474 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
|
7475 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
|
7476 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
|
7477 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7478 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
|
7479 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
|
7480 [cont setRowBgOdd:oddcolor |
|
45abd53a3fc6
Mac: Moved even/odd color code into DWContainer class since
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1957
diff
changeset
|
7481 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
|
7482 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
|
7483 } |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
7484 |
|
c7bb48cda53a
Switched from using NSBrowserCell to a DWImageAndTextCell subclass on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1204
diff
changeset
|
7485 /* |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7486 * 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
|
7487 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7488 * 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
|
7489 * 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
|
7490 * width: Width of column in pixels. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7491 */ |
|
1955
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_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
|
7493 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
|
7494 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
|
7495 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
|
7496 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7497 DW_FUNCTION_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
|
7498 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
|
7499 if([cont filesystem]) |
|
168b9db65825
Minor fix for dw_container_column_set_width() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
829
diff
changeset
|
7500 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
|
7501 NSTableColumn *col = [cont getColumn:column]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
7502 |
|
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
|
7503 [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
|
7504 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7505 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7506 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7507 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7508 * 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
|
7509 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7510 * 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
|
7511 * 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
|
7512 * title: String title of the item. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7513 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7514 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
|
7515 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
|
7516 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
|
7517 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
|
7518 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7519 DW_FUNCTION_INIT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7520 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
|
7521 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
|
7522 [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
|
7523 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
|
7524 } |
|
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
|
7525 |
|
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
|
7526 |
|
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
|
7527 /* |
|
1871
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7528 * 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
|
7529 * Parameters: |
|
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7530 * 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
|
7531 * 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
|
7532 * 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
|
7533 */ |
|
1955
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_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
|
7535 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
|
7536 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
|
7537 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
|
7538 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7539 DW_FUNCTION_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
|
7540 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
|
7541 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
|
7542 [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
|
7543 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
|
7544 } |
|
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7545 |
|
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7546 |
|
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7547 /* |
|
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
|
7548 * 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
|
7549 * 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
|
7550 * 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
|
7551 * 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
|
7552 * 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
|
7553 */ |
|
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_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
|
7555 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
|
7556 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
|
7557 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
|
7558 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7559 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
|
7560 DWContainer *cont = handle; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7561 [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
|
7562 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7563 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7564 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7565 /* |
|
1871
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7566 * 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
|
7567 * Parameters: |
|
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7568 * 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
|
7569 * 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
|
7570 * 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
|
7571 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7572 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
|
7573 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
|
7574 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
|
7575 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
|
7576 { |
|
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_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
|
7578 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
|
7579 [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
|
7580 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
|
7581 } |
|
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7582 |
|
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7583 /* |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7584 * 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
|
7585 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7586 * 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
|
7587 * 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
|
7588 * 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
|
7589 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7590 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
|
7591 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
|
7592 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
|
7593 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
|
7594 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7595 DW_FUNCTION_INIT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7596 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
|
7597 [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
|
7598 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7599 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7600 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7601 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7602 * Removes all rows from a container. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7603 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7604 * 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
|
7605 * 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
|
7606 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7607 DW_FUNCTION_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
|
7608 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
|
7609 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
|
7610 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
|
7611 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7612 DW_FUNCTION_INIT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7613 DWContainer *cont = handle; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7614 [cont clear]; |
|
670
0b920d0dc13e
Implemented bitmap buttons and pixmaps from bundle resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
669
diff
changeset
|
7615 if(redraw) |
|
0b920d0dc13e
Implemented bitmap buttons and pixmaps from bundle resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
669
diff
changeset
|
7616 [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
|
7617 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7618 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7619 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7620 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7621 * 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
|
7622 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7623 * 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
|
7624 * 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
|
7625 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7626 DW_FUNCTION_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
|
7627 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
|
7628 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
|
7629 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
|
7630 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7631 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
|
7632 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
|
7633 int x; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
7634 |
|
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
|
7635 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
|
7636 { |
|
48f8efba898f
Filled in most of the remaining MLE and container functions... the remaining few
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
674
diff
changeset
|
7637 [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
|
7638 } |
|
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
|
7639 [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
|
7640 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7641 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7642 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7643 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7644 * Scrolls container up or down. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7645 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7646 * 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
|
7647 * 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
|
7648 * 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
|
7649 * 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
|
7650 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7651 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
|
7652 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
|
7653 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
|
7654 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
|
7655 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7656 DW_FUNCTION_INIT; |
|
837
89d4bad9c96e
Initial attempt at implementing the scrollbox on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
831
diff
changeset
|
7657 DWContainer *cont = handle; |
|
89d4bad9c96e
Initial attempt at implementing the scrollbox on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
831
diff
changeset
|
7658 NSScrollView *sv = [cont scrollview]; |
|
852
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7659 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
|
7660 int rowcount = (int)[cont numberOfRowsInTableView:cont]; |
|
852
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7661 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
|
7662 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
|
7663 |
|
853
c27ce204302b
Add safety check to avoid potential divide by zero.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
852
diff
changeset
|
7664 /* Safety check */ |
|
c27ce204302b
Add safety check to avoid potential divide by zero.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
852
diff
changeset
|
7665 if(rowcount < 1) |
|
c27ce204302b
Add safety check to avoid potential divide by zero.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
852
diff
changeset
|
7666 { |
|
c27ce204302b
Add safety check to avoid potential divide by zero.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
852
diff
changeset
|
7667 return; |
|
c27ce204302b
Add safety check to avoid potential divide by zero.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
852
diff
changeset
|
7668 } |
|
938
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
7669 |
|
853
c27ce204302b
Add safety check to avoid potential divide by zero.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
852
diff
changeset
|
7670 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
|
7671 |
|
852
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7672 switch(direction) |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7673 { |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7674 case DW_SCROLL_TOP: |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7675 { |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7676 [scrollbar setFloatValue:0]; |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7677 break; |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7678 } |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7679 case DW_SCROLL_BOTTOM: |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7680 { |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7681 [scrollbar setFloatValue:1]; |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7682 break; |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7683 } |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7684 case DW_SCROLL_UP: |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7685 { |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7686 float newpos = currpos - change; |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7687 if(newpos < 0) |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7688 { |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7689 newpos = 0; |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7690 } |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7691 [scrollbar setFloatValue:newpos]; |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7692 break; |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7693 } |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7694 case DW_SCROLL_DOWN: |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7695 { |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7696 float newpos = currpos + change; |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7697 if(newpos > 1) |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7698 { |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7699 newpos = 1; |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7700 } |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7701 [scrollbar setFloatValue:newpos]; |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7702 break; |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7703 } |
|
bb582f89007a
Implemented dw_container_scroll() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
851
diff
changeset
|
7704 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7705 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7706 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7707 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7708 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7709 * 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
|
7710 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7711 * 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
|
7712 * 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
|
7713 * 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
|
7714 * 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
|
7715 */ |
|
1955
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_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
|
7717 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
|
7718 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
|
7719 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
|
7720 { |
|
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_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
|
7722 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
|
7723 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
|
7724 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
|
7725 void *retval = NULL; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
7726 |
|
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
|
7727 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
|
7728 { |
|
1871
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7729 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
|
7730 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
|
7731 else |
|
1885
0768bbcf67e5
Need to duplicate container query results on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1874
diff
changeset
|
7732 { |
|
0768bbcf67e5
Need to duplicate container query results on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1874
diff
changeset
|
7733 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
|
7734 if(temp) |
|
0768bbcf67e5
Need to duplicate container query results on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1874
diff
changeset
|
7735 retval = strdup(temp); |
|
0768bbcf67e5
Need to duplicate container query results on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1874
diff
changeset
|
7736 } |
|
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
|
7737 [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
|
7738 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7739 DW_FUNCTION_RETURN_THIS(retval); |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7740 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7741 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7742 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7743 * 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
|
7744 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7745 * 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
|
7746 * 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
|
7747 * 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
|
7748 * 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
|
7749 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7750 DW_FUNCTION_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
|
7751 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
|
7752 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
|
7753 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
|
7754 { |
|
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_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
|
7756 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
|
7757 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
|
7758 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
|
7759 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
|
7760 void *retval = NULL; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
7761 |
|
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
|
7762 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
|
7763 { |
|
1871
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7764 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
|
7765 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
|
7766 else |
|
1885
0768bbcf67e5
Need to duplicate container query results on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1874
diff
changeset
|
7767 { |
|
0768bbcf67e5
Need to duplicate container query results on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1874
diff
changeset
|
7768 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
|
7769 if(temp) |
|
0768bbcf67e5
Need to duplicate container query results on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1874
diff
changeset
|
7770 retval = strdup(temp); |
|
0768bbcf67e5
Need to duplicate container query results on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1874
diff
changeset
|
7771 } |
|
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
|
7772 [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
|
7773 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7774 DW_FUNCTION_RETURN_THIS(retval); |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7775 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7776 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7777 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7778 * 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
|
7779 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7780 * 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
|
7781 * 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
|
7782 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7783 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
|
7784 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
|
7785 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
|
7786 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
|
7787 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7788 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
|
7789 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
|
7790 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
|
7791 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
|
7792 int x, count = (int)[cont numberOfRowsInTableView:cont]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
7793 |
|
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
|
7794 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
|
7795 { |
|
48f8efba898f
Filled in most of the remaining MLE and container functions... the remaining few
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
674
diff
changeset
|
7796 thistext = [cont getRowTitle:x]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
7797 |
|
1871
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7798 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
|
7799 { |
|
48f8efba898f
Filled in most of the remaining MLE and container functions... the remaining few
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
674
diff
changeset
|
7800 NSIndexSet *selected = [[NSIndexSet alloc] initWithIndex:(NSUInteger)x]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
7801 |
|
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
|
7802 [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
|
7803 [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
|
7804 [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
|
7805 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
|
7806 break; |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7807 } |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7808 } |
|
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
|
7809 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
|
7810 DW_FUNCTION_RETURN_NOTHING; |
|
650
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 /* |
|
1871
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7814 * 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
|
7815 * Parameters: |
|
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7816 * 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
|
7817 * 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
|
7818 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7819 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
|
7820 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
|
7821 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
|
7822 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
|
7823 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7824 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
|
7825 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
|
7826 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
|
7827 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
|
7828 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
|
7829 |
|
1871
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7830 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
|
7831 { |
|
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7832 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
|
7833 |
|
1871
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7834 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
|
7835 { |
|
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7836 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
|
7837 |
|
1871
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7838 [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
|
7839 [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
|
7840 [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
|
7841 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
|
7842 break; |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7843 } |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7844 } |
|
1871
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7845 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
|
7846 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
|
7847 } |
|
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7848 |
|
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7849 /* |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7850 * 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
|
7851 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7852 * handle: Handle to the window (widget). |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7853 * 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
|
7854 */ |
|
1955
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_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
|
7856 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
|
7857 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
|
7858 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
|
7859 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7860 DW_FUNCTION_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
|
7861 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
|
7862 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
|
7863 int x, count = (int)[cont numberOfRowsInTableView:cont]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
7864 |
|
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
|
7865 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
|
7866 { |
|
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 thistext = [cont getRowTitle:x]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
7868 |
|
1871
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7869 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
|
7870 { |
|
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7871 [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
|
7872 [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
|
7873 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
|
7874 break; |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7875 } |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7876 } |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7877 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
|
7878 } |
|
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7879 |
|
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7880 /* |
|
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7881 * 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
|
7882 * Parameters: |
|
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7883 * 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
|
7884 * 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
|
7885 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7886 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
|
7887 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
|
7888 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
|
7889 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
|
7890 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7891 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
|
7892 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
|
7893 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
|
7894 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
|
7895 |
|
1871
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7896 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
|
7897 { |
|
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7898 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
|
7899 |
|
1871
3f571ad9b92e
First Mac round of changes aimed at separating the data and text
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1862
diff
changeset
|
7900 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
|
7901 { |
|
48f8efba898f
Filled in most of the remaining MLE and container functions... the remaining few
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
674
diff
changeset
|
7902 [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
|
7903 [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
|
7904 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
|
7905 break; |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7906 } |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7907 } |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7908 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7909 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7910 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7911 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7912 * 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
|
7913 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7914 * 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
|
7915 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7916 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
|
7917 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
|
7918 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
|
7919 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
|
7920 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
7921 DW_FUNCTION_INIT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
7922 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
|
7923 [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
|
7924 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7925 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7926 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7927 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7928 * Inserts an icon into the taskbar. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7929 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7930 * 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
|
7931 * 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
|
7932 * 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
|
7933 */ |
|
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
|
7934 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
|
7935 { |
|
1943
469711814566
Mac: Fix NSStatusItem deprecation warnings by using the embedded NSStatusBarButton instead.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1942
diff
changeset
|
7936 #ifdef BUILDING_FOR_YOSEMITE |
|
1220
67ff39b9577c
Initial implementation of dw_taskbar_* for the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1215
diff
changeset
|
7937 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
|
7938 NSStatusBarButton *button = [item button]; |
|
1220
67ff39b9577c
Initial implementation of dw_taskbar_* for the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1215
diff
changeset
|
7939 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
|
7940 [button setImage:image]; |
|
1220
67ff39b9577c
Initial implementation of dw_taskbar_* for the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1215
diff
changeset
|
7941 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
|
7942 [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
|
7943 [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
|
7944 [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
|
7945 [[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
|
7946 [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
|
7947 [button setAction:@selector(mouseDown:)]; |
|
1220
67ff39b9577c
Initial implementation of dw_taskbar_* for the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1215
diff
changeset
|
7948 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
|
7949 #endif |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7950 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7951 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7952 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7953 * Deletes an icon from the taskbar. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7954 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7955 * 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
|
7956 * 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
|
7957 */ |
|
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
|
7958 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
|
7959 { |
|
1943
469711814566
Mac: Fix NSStatusItem deprecation warnings by using the embedded NSStatusBarButton instead.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1942
diff
changeset
|
7960 #ifdef BUILDING_FOR_YOSEMITE |
|
1220
67ff39b9577c
Initial implementation of dw_taskbar_* for the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1215
diff
changeset
|
7961 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
|
7962 DW_LOCAL_POOL_IN; |
|
1220
67ff39b9577c
Initial implementation of dw_taskbar_* for the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1215
diff
changeset
|
7963 [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
|
7964 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
|
7965 #endif |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7966 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7967 |
|
1708
cc10082567ed
Similar code for Mac to keep HICNs from getting too big.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1705
diff
changeset
|
7968 /* 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
|
7969 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
|
7970 { |
|
1709
de49c1f284b2
Safety check for the icon resize code on Mac and GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1708
diff
changeset
|
7971 if(image) |
|
de49c1f284b2
Safety check for the icon resize code on Mac and GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1708
diff
changeset
|
7972 { |
|
de49c1f284b2
Safety check for the icon resize code on Mac and GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1708
diff
changeset
|
7973 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
|
7974 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
|
7975 { |
|
de49c1f284b2
Safety check for the icon resize code on Mac and GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1708
diff
changeset
|
7976 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
|
7977 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
|
7978 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
|
7979 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
|
7980 [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
|
7981 } |
|
1708
cc10082567ed
Similar code for Mac to keep HICNs from getting too big.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1705
diff
changeset
|
7982 } |
|
cc10082567ed
Similar code for Mac to keep HICNs from getting too big.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1705
diff
changeset
|
7983 } |
|
cc10082567ed
Similar code for Mac to keep HICNs from getting too big.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1705
diff
changeset
|
7984 |
|
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
|
7985 /* 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
|
7986 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
|
7987 { |
|
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
|
7988 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
|
7989 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
|
7990 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
|
7991 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
|
7992 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
|
7993 } |
|
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
|
7994 |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7995 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7996 * 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
|
7997 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7998 * 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
|
7999 * 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
|
8000 * 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
|
8001 * to an embedded XPM. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8002 */ |
|
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
|
8003 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
|
8004 { |
|
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
|
8005 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
|
8006 _icon_resize(image); |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8007 return image; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8008 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8009 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8010 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8011 * Obtains an icon from a file. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8012 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8013 * 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
|
8014 * DW pick the appropriate file extension. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8015 * (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
|
8016 */ |
|
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
|
8017 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
|
8018 { |
|
938
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
8019 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
|
8020 |
|
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
|
8021 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
|
8022 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
|
8023 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
|
8024 { |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
8025 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
|
8026 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
|
8027 } |
|
1708
cc10082567ed
Similar code for Mac to keep HICNs from getting too big.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1705
diff
changeset
|
8028 _icon_resize(image); |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8029 return image; |
|
650
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 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8033 * Obtains an icon from data |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8034 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8035 * 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
|
8036 * DW pick the appropriate file extension. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8037 * (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
|
8038 */ |
|
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
|
8039 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
|
8040 { |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
8041 NSData *thisdata = [NSData dataWithBytes:data length:len]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8042 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
|
8043 _icon_resize(image); |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8044 return image; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8045 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8046 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8047 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8048 * 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
|
8049 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8050 * 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
|
8051 */ |
|
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
|
8052 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
|
8053 { |
|
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
|
8054 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
|
8055 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
|
8056 [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
|
8057 DW_LOCAL_POOL_OUT; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8058 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8059 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8060 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8061 * 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
|
8062 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8063 * 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
|
8064 */ |
|
685
314a12dccd20
Cleanups for conflicts with "id" which is a keyword in Objective-C.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
684
diff
changeset
|
8065 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
|
8066 { |
|
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
|
8067 /* 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
|
8068 * 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
|
8069 * when the application is deactivated to simulate |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
8070 * 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
|
8071 */ |
|
014b02436c1f
Added MDI simulation code... the MDI "window" will just be a box for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
683
diff
changeset
|
8072 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
|
8073 /* [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
|
8074 return mdi; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8075 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8076 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8077 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8078 * 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
|
8079 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8080 * 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
|
8081 * 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
|
8082 * 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
|
8083 * Returns: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8084 * 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
|
8085 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
8086 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
|
8087 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
|
8088 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
|
8089 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
|
8090 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
8091 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
|
8092 id tmpbox = dw_box_new(DW_VERT, 0); |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8093 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
|
8094 [split setDelegate:split]; |
|
7b99731c6484
Fixes for splitbars (horizontal and vertical definitions are reversed).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
667
diff
changeset
|
8095 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
|
8096 [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
|
8097 [tmpbox autorelease]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
8098 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
|
8099 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
|
8100 [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
|
8101 [tmpbox autorelease]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8102 if(type == DW_VERT) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8103 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8104 [split setVertical:NO]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8105 } |
|
668
7b99731c6484
Fixes for splitbars (horizontal and vertical definitions are reversed).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
667
diff
changeset
|
8106 else |
|
7b99731c6484
Fixes for splitbars (horizontal and vertical definitions are reversed).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
667
diff
changeset
|
8107 { |
|
7b99731c6484
Fixes for splitbars (horizontal and vertical definitions are reversed).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
667
diff
changeset
|
8108 [split setVertical:YES]; |
|
7b99731c6484
Fixes for splitbars (horizontal and vertical definitions are reversed).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
667
diff
changeset
|
8109 } |
|
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
|
8110 /* 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
|
8111 [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
|
8112 [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
|
8113 DW_FUNCTION_RETURN_THIS(split); |
|
650
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 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8116 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8117 * 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
|
8118 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8119 * 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
|
8120 * 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
|
8121 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
8122 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
|
8123 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
|
8124 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
|
8125 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
|
8126 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
8127 DW_FUNCTION_INIT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8128 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
|
8129 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
|
8130 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
|
8131 /* 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
|
8132 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
|
8133 { |
|
677
99002595f549
Fixes for dw_splitbar_set() not working on an unsized window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
676
diff
changeset
|
8134 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
|
8135 } |
|
99002595f549
Fixes for dw_splitbar_set() not working on an unsized window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
676
diff
changeset
|
8136 else |
|
99002595f549
Fixes for dw_splitbar_set() not working on an unsized window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
676
diff
changeset
|
8137 { |
|
676
9861d264925d
MLE was missing the scrollbar. Fixes for getting and setting the position.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
675
diff
changeset
|
8138 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
|
8139 } |
|
677
99002595f549
Fixes for dw_splitbar_set() not working on an unsized window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
676
diff
changeset
|
8140 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
|
8141 { |
|
99002595f549
Fixes for dw_splitbar_set() not working on an unsized window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
676
diff
changeset
|
8142 [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
|
8143 } |
|
676
9861d264925d
MLE was missing the scrollbar. Fixes for getting and setting the position.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
675
diff
changeset
|
8144 else |
|
9861d264925d
MLE was missing the scrollbar. Fixes for getting and setting the position.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
675
diff
changeset
|
8145 { |
|
677
99002595f549
Fixes for dw_splitbar_set() not working on an unsized window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
676
diff
changeset
|
8146 /* 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
|
8147 * 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
|
8148 * 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
|
8149 */ |
|
99002595f549
Fixes for dw_splitbar_set() not working on an unsized window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
676
diff
changeset
|
8150 [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
|
8151 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
8152 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8153 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8154 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8155 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8156 * 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
|
8157 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8158 * 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
|
8159 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8160 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
|
8161 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8162 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
|
8163 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
|
8164 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
|
8165 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
|
8166 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
|
8167 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
|
8168 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
|
8169 { |
|
677
99002595f549
Fixes for dw_splitbar_set() not working on an unsized window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
676
diff
changeset
|
8170 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
|
8171 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
|
8172 } |
|
9861d264925d
MLE was missing the scrollbar. Fixes for getting and setting the position.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
675
diff
changeset
|
8173 else |
|
9861d264925d
MLE was missing the scrollbar. Fixes for getting and setting the position.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
675
diff
changeset
|
8174 { |
|
677
99002595f549
Fixes for dw_splitbar_set() not working on an unsized window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
676
diff
changeset
|
8175 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
|
8176 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
|
8177 } |
|
9861d264925d
MLE was missing the scrollbar. Fixes for getting and setting the position.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
675
diff
changeset
|
8178 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
|
8179 { |
|
9861d264925d
MLE was missing the scrollbar. Fixes for getting and setting the position.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
675
diff
changeset
|
8180 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
|
8181 } |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8182 return retval; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8183 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8184 |
|
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
|
8185 /* 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
|
8186 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
|
8187 { |
|
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
|
8188 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
|
8189 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
|
8190 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
|
8191 |
|
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
|
8192 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
|
8193 { |
|
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
|
8194 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
|
8195 *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
|
8196 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
|
8197 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
|
8198 } |
|
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
|
8199 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
|
8200 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
|
8201 } |
|
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
|
8202 |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8203 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8204 * 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
|
8205 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8206 * 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
|
8207 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
8208 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
|
8209 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
|
8210 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
|
8211 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
|
8212 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
8213 DW_FUNCTION_INIT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8214 NSImageView *bitmap = [[NSImageView alloc] init]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8215 [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
|
8216 [bitmap setImageScaling:NSImageScaleNone]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8217 [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
|
8218 [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
|
8219 DW_FUNCTION_RETURN_THIS(bitmap); |
|
650
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 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8222 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8223 * Creates a pixmap with given parameters. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8224 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8225 * 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
|
8226 * 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
|
8227 * 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
|
8228 * depth: Color depth of the pixmap. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8229 * Returns: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8230 * 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
|
8231 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8232 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
|
8233 { |
|
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
|
8234 HPIXMAP pixmap; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
8235 |
|
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
|
8236 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
|
8237 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
|
8238 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
|
8239 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
|
8240 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
|
8241 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
|
8242 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
|
8243 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
|
8244 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
|
8245 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
|
8246 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
|
8247 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
|
8248 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
|
8249 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
|
8250 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
|
8251 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
|
8252 return pixmap; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8253 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8254 |
|
957
beed3e7f9d4b
Fixes to flip pixmaps when loading from file or data on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
954
diff
changeset
|
8255 /* 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
|
8256 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
|
8257 { |
|
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
|
8258 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
|
8259 [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
|
8260 [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
|
8261 [[[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
|
8262 /* 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
|
8263 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
|
8264 |
|
1590
9eef6f82ee50
Comment cleanup in the Mac source.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1586
diff
changeset
|
8265 /* 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
|
8266 [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
|
8267 |
|
1590
9eef6f82ee50
Comment cleanup in the Mac source.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1586
diff
changeset
|
8268 /* 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
|
8269 [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
|
8270 |
|
1590
9eef6f82ee50
Comment cleanup in the Mac source.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1586
diff
changeset
|
8271 /* 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
|
8272 [t concat]; |
|
536ec60ee433
Don't destroy a pixmap if the handle is null
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
980
diff
changeset
|
8273 [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
|
8274 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
|
8275 [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
|
8276 } |
|
beed3e7f9d4b
Fixes to flip pixmaps when loading from file or data on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
954
diff
changeset
|
8277 |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8278 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8279 * Creates a pixmap from a file. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8280 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8281 * 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
|
8282 * 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
|
8283 * DW pick the appropriate file extension. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8284 * (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
|
8285 * Returns: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8286 * 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
|
8287 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8288 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
|
8289 { |
|
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
|
8290 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
|
8291 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
|
8292 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
|
8293 |
|
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
|
8294 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
|
8295 { |
|
a51397ea24bf
Added local auto-release macros on Mac to allow us to prevent leaks
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1574
diff
changeset
|
8296 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
|
8297 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
|
8298 } |
|
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
|
8299 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
|
8300 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
|
8301 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
|
8302 { |
|
cfcf66a90e8c
Add support for different image file types in dw_*_from_file() functions.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
937
diff
changeset
|
8303 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
|
8304 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
|
8305 } |
|
beed3e7f9d4b
Fixes to flip pixmaps when loading from file or data on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
954
diff
changeset
|
8306 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
|
8307 { |
|
a51397ea24bf
Added local auto-release macros on Mac to allow us to prevent leaks
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1574
diff
changeset
|
8308 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
|
8309 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
|
8310 } |
|
957
beed3e7f9d4b
Fixes to flip pixmaps when loading from file or data on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
954
diff
changeset
|
8311 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
|
8312 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
|
8313 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
|
8314 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
|
8315 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
|
8316 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
|
8317 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
|
8318 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
|
8319 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
|
8320 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
|
8321 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
|
8322 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
|
8323 _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
|
8324 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
|
8325 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
|
8326 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
|
8327 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
|
8328 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
|
8329 return pixmap; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8330 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8331 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8332 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8333 * Creates a pixmap from memory. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8334 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8335 * handle: Window handle the pixmap is associated with. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8336 * data: Source of the image data |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8337 * (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
|
8338 * le: length of data |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8339 * Returns: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8340 * A handle to a pixmap or NULL on failure. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8341 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8342 HPIXMAP API dw_pixmap_new_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
|
8343 { |
|
745
d29fb0d5b291
Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
744
diff
changeset
|
8344 HPIXMAP pixmap; |
|
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
|
8345 DW_LOCAL_POOL_IN; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
8346 |
|
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
|
8347 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
|
8348 { |
|
a51397ea24bf
Added local auto-release macros on Mac to allow us to prevent leaks
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1574
diff
changeset
|
8349 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
|
8350 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
|
8351 } |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
8352 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
|
8353 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
|
8354 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
|
8355 { |
|
a51397ea24bf
Added local auto-release macros on Mac to allow us to prevent leaks
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1574
diff
changeset
|
8356 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
|
8357 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
|
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 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
|
8360 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
|
8361 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
|
8362 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
|
8363 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
|
8364 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
|
8365 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
|
8366 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
|
8367 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
|
8368 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
|
8369 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
|
8370 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
|
8371 _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
|
8372 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
|
8373 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
|
8374 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
|
8375 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
|
8376 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
|
8377 return pixmap; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8378 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8379 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8380 /* |
|
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
|
8381 * 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
|
8382 * 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
|
8383 * 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
|
8384 * 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
|
8385 * 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
|
8386 * 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
|
8387 * is handled automatically |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8388 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8389 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
|
8390 { |
|
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
|
8391 /* Don't do anything */ |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8392 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8393 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8394 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8395 * 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
|
8396 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8397 * 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
|
8398 * 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
|
8399 * Returns: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8400 * 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
|
8401 */ |
|
670
0b920d0dc13e
Implemented bitmap buttons and pixmaps from bundle resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
669
diff
changeset
|
8402 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
|
8403 { |
|
745
d29fb0d5b291
Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
744
diff
changeset
|
8404 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
|
8405 DW_LOCAL_POOL_IN; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
8406 |
|
745
d29fb0d5b291
Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
744
diff
changeset
|
8407 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
|
8408 { |
|
a51397ea24bf
Added local auto-release macros on Mac to allow us to prevent leaks
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1574
diff
changeset
|
8409 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
|
8410 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
|
8411 } |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
8412 |
|
670
0b920d0dc13e
Implemented bitmap buttons and pixmaps from bundle resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
669
diff
changeset
|
8413 NSBundle *bundle = [NSBundle mainBundle]; |
|
0b920d0dc13e
Implemented bitmap buttons and pixmaps from bundle resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
669
diff
changeset
|
8414 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
|
8415 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
|
8416 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
|
8417 |
|
1318
ebd67be26f43
Fixed some issues and deprecations building with Xcode 4.2 on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1314
diff
changeset
|
8418 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
|
8419 { |
|
ebd67be26f43
Fixed some issues and deprecations building with Xcode 4.2 on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1314
diff
changeset
|
8420 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
|
8421 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
|
8422 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
|
8423 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
|
8424 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
|
8425 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
|
8426 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
|
8427 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
|
8428 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
|
8429 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
|
8430 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
|
8431 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
|
8432 _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
|
8433 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
|
8434 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
|
8435 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
|
8436 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
|
8437 [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
|
8438 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
|
8439 } |
|
ebd67be26f43
Fixed some issues and deprecations building with Xcode 4.2 on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1314
diff
changeset
|
8440 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
|
8441 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
|
8442 return NULL; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8443 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8444 |
|
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
|
8445 /* |
|
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
|
8446 * 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
|
8447 * 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
|
8448 * 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
|
8449 * 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
|
8450 * 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
|
8451 * 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
|
8452 * 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
|
8453 * 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
|
8454 * 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
|
8455 */ |
|
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
|
8456 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
|
8457 { |
|
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
|
8458 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
|
8459 { |
|
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
|
8460 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
|
8461 |
|
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
|
8462 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
|
8463 { |
|
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
|
8464 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
|
8465 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
|
8466 [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
|
8467 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
|
8468 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
|
8469 [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
|
8470 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
|
8471 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
|
8472 } |
|
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
|
8473 } |
|
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
|
8474 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
|
8475 } |
|
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
|
8476 |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8477 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8478 * Destroys an allocated pixmap. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8479 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8480 * 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
|
8481 * dw_pixmap_new.. |
|
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 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
|
8484 { |
|
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
|
8485 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
|
8486 { |
|
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
|
8487 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
|
8488 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
|
8489 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
|
8490 [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
|
8491 [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
|
8492 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
|
8493 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
|
8494 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8495 } |
|
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 * Copies from one item to another. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8499 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8500 * dest: Destination window handle. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8501 * destp: Destination pixmap. (choose only one). |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8502 * xdest: X coordinate of destination. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8503 * ydest: Y coordinate of destination. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8504 * width: Width of area to copy. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8505 * height: Height of area to copy. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8506 * src: Source window handle. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8507 * srcp: Source pixmap. (choose only one). |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8508 * xsrc: X coordinate of source. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8509 * ysrc: Y coordinate of source. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8510 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8511 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
|
8512 { |
|
1247
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8513 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
|
8514 } |
|
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8515 |
|
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8516 /* |
|
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8517 * 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
|
8518 * Parameters: |
|
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8519 * dest: Destination window handle. |
|
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8520 * destp: Destination pixmap. (choose only one). |
|
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8521 * xdest: X coordinate of destination. |
|
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8522 * ydest: Y coordinate of destination. |
|
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8523 * width: Width of the target area. |
|
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8524 * height: Height of the target area. |
|
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8525 * src: Source window handle. |
|
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8526 * srcp: Source pixmap. (choose only one). |
|
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8527 * xsrc: X coordinate of source. |
|
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8528 * ysrc: Y coordinate of source. |
|
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8529 * srcwidth: Width of area to copy. |
|
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8530 * srcheight: Height of area to copy. |
|
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8531 * Returns: |
|
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8532 * 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
|
8533 */ |
|
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8534 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
|
8535 { |
|
1886
f7d408a47752
Fix a couple of errors reported by the static analyzer on Mac....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1885
diff
changeset
|
8536 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
|
8537 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
|
8538 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
|
8539 |
|
1247
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8540 /* 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
|
8541 if((!dest && !destp) || (!src && !srcp) || |
|
1247
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8542 ((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
|
8543 { |
|
a51397ea24bf
Added local auto-release macros on Mac to allow us to prevent leaks
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1574
diff
changeset
|
8544 DW_LOCAL_POOL_OUT; |
|
1247
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8545 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
|
8546 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
8547 |
|
1886
f7d408a47752
Fix a couple of errors reported by the static analyzer on Mac....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1885
diff
changeset
|
8548 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
|
8549 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
|
8550 |
|
699
b79300831495
Offload some drawing functions to the main thread to prevent focus deadlocks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
698
diff
changeset
|
8551 /* 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
|
8552 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
|
8553 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
|
8554 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
|
8555 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
|
8556 bltinfo->width = width; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
8557 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
|
8558 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
|
8559 bltinfo->ysrc = ysrc; |
|
1247
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8560 bltinfo->srcwidth = srcwidth; |
|
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8561 bltinfo->srcheight = srcheight; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
8562 |
|
699
b79300831495
Offload some drawing functions to the main thread to prevent focus deadlocks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
698
diff
changeset
|
8563 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
|
8564 { |
|
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
|
8565 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
|
8566 } |
|
b79300831495
Offload some drawing functions to the main thread to prevent focus deadlocks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
698
diff
changeset
|
8567 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
|
8568 { |
|
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
|
8569 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
|
8570 [object retain]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
8571 } |
|
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
|
8572 [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
|
8573 DW_LOCAL_POOL_OUT; |
|
1247
93607596cf85
Implemented dw_pixmap_stretch_bitblt() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1241
diff
changeset
|
8574 return DW_ERROR_NONE; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8575 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8576 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8577 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8578 * 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
|
8579 * Not available under OS/2, eCS |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8580 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8581 * 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
|
8582 * 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
|
8583 */ |
|
685
314a12dccd20
Cleanups for conflicts with "id" which is a keyword in Objective-C.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
684
diff
changeset
|
8584 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
|
8585 { |
|
729
6712e4211522
Switched to graphical calendar control style... and fixed date querying code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
728
diff
changeset
|
8586 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
|
8587 [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
|
8588 [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
|
8589 [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
|
8590 [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
|
8591 [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
|
8592 return calendar; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8593 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8594 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8595 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8596 * Sets the current date of a calendar |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8597 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8598 * 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
|
8599 * year... |
|
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 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
|
8602 { |
|
729
6712e4211522
Switched to graphical calendar control style... and fixed date querying code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
728
diff
changeset
|
8603 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
|
8604 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
|
8605 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
|
8606 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
|
8607 |
|
1902
74f50459c530
Fix some deprecations introduced in Mac OS X Yosemite 10.10...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1896
diff
changeset
|
8608 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
|
8609 |
|
1902
74f50459c530
Fix some deprecations introduced in Mac OS X Yosemite 10.10...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1896
diff
changeset
|
8610 NSDateFormatter *dateFormatter = [[[NSDateFormatter alloc] init] autorelease]; |
|
1903
b94b4ad26a05
Minor fixes and changes to remove deprecation warnings in 10.10 and
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1902
diff
changeset
|
8611 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
|
8612 |
|
1902
74f50459c530
Fix some deprecations introduced in Mac OS X Yosemite 10.10...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1896
diff
changeset
|
8613 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
|
8614 [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
|
8615 [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
|
8616 DW_LOCAL_POOL_OUT; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8617 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8618 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8619 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8620 * 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
|
8621 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8622 * 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
|
8623 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8624 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
|
8625 { |
|
729
6712e4211522
Switched to graphical calendar control style... and fixed date querying code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
728
diff
changeset
|
8626 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
|
8627 DW_LOCAL_POOL_IN; |
|
729
6712e4211522
Switched to graphical calendar control style... and fixed date querying code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
728
diff
changeset
|
8628 NSDate *date = [calendar dateValue]; |
|
6712e4211522
Switched to graphical calendar control style... and fixed date querying code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
728
diff
changeset
|
8629 NSDateFormatter *df = [[NSDateFormatter alloc] init]; |
|
6712e4211522
Switched to graphical calendar control style... and fixed date querying code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
728
diff
changeset
|
8630 [df setDateStyle:NSDateFormatterShortStyle]; |
|
6712e4211522
Switched to graphical calendar control style... and fixed date querying code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
728
diff
changeset
|
8631 NSString *nstr = [df stringFromDate:date]; |
|
6712e4211522
Switched to graphical calendar control style... and fixed date querying code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
728
diff
changeset
|
8632 sscanf([ nstr UTF8String ], "%d/%d/%d", month, day, year); |
|
730
d3fb3613726a
Calendar control should return years with 4 digits not 2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
729
diff
changeset
|
8633 if(*year < 70) |
|
d3fb3613726a
Calendar control should return years with 4 digits not 2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
729
diff
changeset
|
8634 { |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
8635 *year += 2000; |
|
730
d3fb3613726a
Calendar control should return years with 4 digits not 2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
729
diff
changeset
|
8636 } |
|
d3fb3613726a
Calendar control should return years with 4 digits not 2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
729
diff
changeset
|
8637 else if(*year < 100) |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
8638 { |
|
730
d3fb3613726a
Calendar control should return years with 4 digits not 2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
729
diff
changeset
|
8639 *year += 1900; |
|
d3fb3613726a
Calendar control should return years with 4 digits not 2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
729
diff
changeset
|
8640 } |
|
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
|
8641 [df 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
|
8642 DW_LOCAL_POOL_OUT; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8643 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8644 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8645 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8646 * 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
|
8647 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8648 * handle: Handle to the window. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8649 * 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
|
8650 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8651 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
|
8652 { |
|
1936
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
8653 DWWebView *html = handle; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8654 switch(action) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8655 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8656 case DW_HTML_GOBACK: |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8657 [html goBack]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8658 break; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8659 case DW_HTML_GOFORWARD: |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8660 [html goForward]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8661 break; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8662 case DW_HTML_GOHOME: |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8663 break; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8664 case DW_HTML_SEARCH: |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8665 break; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8666 case DW_HTML_RELOAD: |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8667 [html reload:html]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8668 break; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8669 case DW_HTML_STOP: |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8670 [html stopLoading:html]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8671 break; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8672 case DW_HTML_PRINT: |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8673 break; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8674 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8675 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8676 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8677 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8678 * 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
|
8679 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8680 * handle: Handle to the window. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8681 * 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
|
8682 * be rendered. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8683 * Returns: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8684 * 0 on success. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8685 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8686 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
|
8687 { |
|
1936
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
8688 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
|
8689 #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
|
8690 [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
|
8691 #else |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8692 [[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
|
8693 #endif |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8694 return 0; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8695 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8696 |
|
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 * 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
|
8699 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8700 * handle: Handle to the window. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8701 * 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
|
8702 * file object to be rendered. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8703 * Returns: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8704 * 0 on success. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8705 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8706 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
|
8707 { |
|
1936
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
8708 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
|
8709 #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
|
8710 [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
|
8711 #else |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8712 [[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
|
8713 #endif |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8714 return 0; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8715 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8716 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8717 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8718 * 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
|
8719 * Not available under OS/2, eCS |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8720 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8721 * 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
|
8722 * 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
|
8723 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
8724 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
|
8725 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
|
8726 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
|
8727 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
|
8728 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
8729 DW_FUNCTION_INIT; |
|
1936
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
8730 DWWebView *web = [[DWWebView 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
|
8731 /* [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
|
8732 DW_FUNCTION_RETURN_THIS(web); |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8733 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8734 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8735 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8736 * 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
|
8737 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8738 * 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
|
8739 * 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
|
8740 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8741 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
|
8742 { |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
8743 NSPoint mouseLoc; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8744 mouseLoc = [NSEvent mouseLocation]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8745 if(x) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8746 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8747 *x = mouseLoc.x; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8748 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8749 if(y) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8750 { |
|
946
c64d3ca566f9
Attempt at inverting the window position and mouse pointer coordinates on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
945
diff
changeset
|
8751 *y = [[NSScreen mainScreen] frame].size.height - mouseLoc.y; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8752 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8753 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8754 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8755 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8756 * 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
|
8757 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8758 * x: X coordinate. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8759 * y: Y coordinate. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8760 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8761 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
|
8762 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8763 /* 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
|
8764 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8765 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8766 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8767 * 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
|
8768 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8769 * 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
|
8770 * resource file. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8771 */ |
|
685
314a12dccd20
Cleanups for conflicts with "id" which is a keyword in Objective-C.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
684
diff
changeset
|
8772 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
|
8773 { |
|
1313
9f12bc79924b
Autorelease fixes for Mac allowing the objects to dealloc when destroyed.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1312
diff
changeset
|
8774 NSMenu *menu = [[NSMenu alloc] init]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8775 [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
|
8776 /* [menu setTag:cid]; Why doesn't this work? */ |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8777 return menu; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8778 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8779 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8780 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8781 * Create a menubar on a window. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8782 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8783 * 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
|
8784 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8785 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
|
8786 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8787 NSWindow *window = location; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8788 NSMenu *windowmenu = _generate_main_menu(); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8789 [[window contentView] setMenu:windowmenu]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8790 return (HMENUI)windowmenu; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8791 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8792 |
|
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 * 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
|
8795 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8796 * menu: Handle of a menu. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8797 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8798 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
|
8799 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8800 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
|
8801 DW_LOCAL_POOL_IN; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8802 [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
|
8803 DW_LOCAL_POOL_OUT; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8804 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8805 |
|
1903
b94b4ad26a05
Minor fixes and changes to remove deprecation warnings in 10.10 and
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1902
diff
changeset
|
8806 /* 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
|
8807 * 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
|
8808 */ |
|
1904
2e456850e027
Minor fix for that last commit... code actually works now. ;)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1903
diff
changeset
|
8809 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
|
8810 { |
|
2e456850e027
Minor fix for that last commit... code actually works now. ;)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1903
diff
changeset
|
8811 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
|
8812 |
|
1903
b94b4ad26a05
Minor fixes and changes to remove deprecation warnings in 10.10 and
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1902
diff
changeset
|
8813 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
|
8814 { |
|
b94b4ad26a05
Minor fixes and changes to remove deprecation warnings in 10.10 and
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1902
diff
changeset
|
8815 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
|
8816 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
|
8817 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
|
8818 } |
|
b94b4ad26a05
Minor fixes and changes to remove deprecation warnings in 10.10 and
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1902
diff
changeset
|
8819 else |
|
b94b4ad26a05
Minor fixes and changes to remove deprecation warnings in 10.10 and
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1902
diff
changeset
|
8820 { |
|
1904
2e456850e027
Minor fix for that last commit... code actually works now. ;)
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1903
diff
changeset
|
8821 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
|
8822 |
|
1903
b94b4ad26a05
Minor fixes and changes to remove deprecation warnings in 10.10 and
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1902
diff
changeset
|
8823 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
|
8824 { |
|
b94b4ad26a05
Minor fixes and changes to remove deprecation warnings in 10.10 and
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1902
diff
changeset
|
8825 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
|
8826 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
|
8827 } |
|
b94b4ad26a05
Minor fixes and changes to remove deprecation warnings in 10.10 and
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1902
diff
changeset
|
8828 } |
|
b94b4ad26a05
Minor fixes and changes to remove deprecation warnings in 10.10 and
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1902
diff
changeset
|
8829 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
|
8830 } |
|
b94b4ad26a05
Minor fixes and changes to remove deprecation warnings in 10.10 and
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1902
diff
changeset
|
8831 |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8832 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8833 * 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
|
8834 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8835 * 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
|
8836 * 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
|
8837 * x: X coordinate. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8838 * y: Y coordinate. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8839 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8840 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
|
8841 { |
|
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
|
8842 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
|
8843 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
|
8844 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
|
8845 NSWindow *window = [view window]; |
|
701
c91a1b345f2e
Fix for button press and context menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
700
diff
changeset
|
8846 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
|
8847 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
|
8848 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
|
8849 [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
|
8850 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
|
8851 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
|
8852 location:_windowPointFromScreen(window, p) |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
8853 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
|
8854 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
|
8855 windowNumber:[window windowNumber] |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
8856 context:[NSGraphicsContext currentContext] |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
8857 eventNumber:1 |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
8858 clickCount:1 |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
8859 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
|
8860 [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
|
8861 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8862 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8863 char _removetilde(char *dest, char *src) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8864 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8865 int z, cur=0; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8866 char accel = '\0'; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
8867 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8868 for(z=0;z<strlen(src);z++) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8869 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8870 if(src[z] != '~') |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8871 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8872 dest[cur] = src[z]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8873 cur++; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8874 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8875 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8876 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8877 accel = src[z+1]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8878 } |
|
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 dest[cur] = 0; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8881 return accel; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8882 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8883 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8884 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8885 * 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
|
8886 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8887 * 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
|
8888 * 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
|
8889 * 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
|
8890 * 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
|
8891 * 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
|
8892 * 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
|
8893 * 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
|
8894 * 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
|
8895 */ |
|
654
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
8896 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
|
8897 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8898 NSMenu *menu = menux; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8899 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
|
8900 DWMenuItem *item = NULL; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8901 if(strlen(title) == 0) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8902 { |
|
1312
c5db6c70905c
Added code to remove signal handlers when objects are destroyed on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1306
diff
changeset
|
8903 [menu addItem:[DWMenuItem separatorItem]]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8904 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8905 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8906 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8907 char accel[2]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8908 char *newtitle = malloc(strlen(title)+1); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8909 NSString *nstr; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
8910 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8911 accel[0] = _removetilde(newtitle, title); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8912 accel[1] = 0; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
8913 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8914 nstr = [ NSString stringWithUTF8String:newtitle ]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8915 free(newtitle); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8916 |
|
1313
9f12bc79924b
Autorelease fixes for Mac allowing the objects to dealloc when destroyed.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1312
diff
changeset
|
8917 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
|
8918 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
|
8919 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
|
8920 [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
|
8921 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8922 [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
|
8923 if(check) |
|
6506f29dfefc
Implement automatic checking and unchecking of menu items on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1513
diff
changeset
|
8924 { |
|
6506f29dfefc
Implement automatic checking and unchecking of menu items on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1513
diff
changeset
|
8925 [item setCheck:YES]; |
|
6506f29dfefc
Implement automatic checking and unchecking of menu items on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1513
diff
changeset
|
8926 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
|
8927 { |
|
1936
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
8928 [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
|
8929 } |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8930 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8931 if(flags & DW_MIS_DISABLED) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8932 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8933 [item setEnabled:NO]; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
8934 } |
|
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
8935 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8936 if(submenux) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8937 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8938 [submenu setTitle:nstr]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8939 [menu setSubmenu:submenu forItem:item]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8940 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8941 return item; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8942 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8943 return item; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8944 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8945 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8946 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8947 * 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
|
8948 * 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
|
8949 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8950 * 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
|
8951 * id: Menuitem id. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8952 * 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
|
8953 */ |
|
654
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
8954 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
|
8955 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8956 id menu = menux; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8957 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
|
8958 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8959 if(menuitem != nil) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8960 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8961 if(check) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8962 { |
|
1936
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
8963 [menuitem setState:DWControlStateValueOn]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8964 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8965 else |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
8966 { |
|
1936
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
8967 [menuitem setState:DWControlStateValueOff]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8968 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
8969 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8970 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8971 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8972 /* |
|
1375
611893219ba9
Implemented dw_menu_delete_item() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1340
diff
changeset
|
8973 * Deletes the menu item specified. |
|
611893219ba9
Implemented dw_menu_delete_item() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1340
diff
changeset
|
8974 * Parameters: |
|
611893219ba9
Implemented dw_menu_delete_item() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1340
diff
changeset
|
8975 * 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
|
8976 * 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
|
8977 * Returns: |
|
1375
611893219ba9
Implemented dw_menu_delete_item() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1340
diff
changeset
|
8978 * 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
|
8979 */ |
|
611893219ba9
Implemented dw_menu_delete_item() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1340
diff
changeset
|
8980 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
|
8981 { |
|
611893219ba9
Implemented dw_menu_delete_item() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1340
diff
changeset
|
8982 id menu = menux; |
|
611893219ba9
Implemented dw_menu_delete_item() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1340
diff
changeset
|
8983 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
|
8984 |
|
1375
611893219ba9
Implemented dw_menu_delete_item() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1340
diff
changeset
|
8985 if(menuitem != nil) |
|
611893219ba9
Implemented dw_menu_delete_item() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1340
diff
changeset
|
8986 { |
|
611893219ba9
Implemented dw_menu_delete_item() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1340
diff
changeset
|
8987 [menu removeItem:menuitem]; |
|
611893219ba9
Implemented dw_menu_delete_item() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1340
diff
changeset
|
8988 return DW_ERROR_NONE; |
|
611893219ba9
Implemented dw_menu_delete_item() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1340
diff
changeset
|
8989 } |
|
611893219ba9
Implemented dw_menu_delete_item() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1340
diff
changeset
|
8990 return DW_ERROR_UNKNOWN; |
|
611893219ba9
Implemented dw_menu_delete_item() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1340
diff
changeset
|
8991 } |
|
611893219ba9
Implemented dw_menu_delete_item() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1340
diff
changeset
|
8992 |
|
611893219ba9
Implemented dw_menu_delete_item() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1340
diff
changeset
|
8993 /* |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8994 * 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
|
8995 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8996 * 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
|
8997 * id: Menuitem id. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
8998 * 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
|
8999 * DW_MIS_CHECKED/DW_MIS_UNCHECKED |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9000 */ |
|
654
80e253df49fd
Implementing the menubar and hopefully popup menus.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
653
diff
changeset
|
9001 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
|
9002 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9003 id menu = menux; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9004 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
|
9005 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9006 if(menuitem != nil) |
|
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 if(state & DW_MIS_CHECKED) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9009 { |
|
1936
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
9010 [menuitem setState:DWControlStateValueOn]; |
|
752
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 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
|
9013 { |
|
1936
ebde5ef666a6
Fixes many deprecation warnings building for MacOS 10.14.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1935
diff
changeset
|
9014 [menuitem setState:DWControlStateValueOff]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9015 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9016 if(state & DW_MIS_ENABLED) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9017 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9018 [menuitem setEnabled:YES]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9019 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9020 else if(state & DW_MIS_DISABLED) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9021 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9022 [menuitem setEnabled:NO]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9023 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9024 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9025 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9026 |
|
652
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
9027 /* 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
|
9028 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
|
9029 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9030 NSArray *pages = [notebook tabViewItems]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9031 for(DWNotebookPage *notepage in pages) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9032 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9033 if([notepage pageid] == pageid) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9034 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9035 return notepage; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9036 } |
|
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 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
|
9039 } |
|
ef0f484c6c4b
Added even more... including first signal handling and notebooks among other controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
651
diff
changeset
|
9040 |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9041 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9042 * 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
|
9043 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9044 * 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
|
9045 * resource file. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9046 */ |
|
685
314a12dccd20
Cleanups for conflicts with "id" which is a keyword in Objective-C.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
684
diff
changeset
|
9047 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
|
9048 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9049 DWNotebook *notebook = [[DWNotebook alloc] init]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9050 [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
|
9051 /* [notebook setTag:cid]; Why doesn't this work? */ |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9052 return notebook; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9053 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9054 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9055 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9056 * 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
|
9057 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9058 * handle: Window (widget) handle. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9059 * flags: Any additional page creation flags. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9060 * 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
|
9061 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9062 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
|
9063 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9064 DWNotebook *notebook = handle; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9065 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
|
9066 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
|
9067 [notepage setPageid:(int)page]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9068 if(front) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9069 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9070 [notebook insertTabViewItem:notepage atIndex:(NSInteger)0]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9071 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9072 else |
|
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 [notebook addTabViewItem:notepage]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9075 } |
|
1313
9f12bc79924b
Autorelease fixes for Mac allowing the objects to dealloc when destroyed.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1312
diff
changeset
|
9076 [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
|
9077 [notebook setPageid:(int)(page+1)]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9078 return (unsigned long)page; |
|
650
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 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9081 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9082 * Remove a page from a notebook. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9083 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9084 * handle: Handle to the notebook widget. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9085 * 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
|
9086 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9087 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
|
9088 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9089 DWNotebook *notebook = handle; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9090 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
|
9091 DW_LOCAL_POOL_IN; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
9092 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9093 if(notepage != nil) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9094 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9095 [notebook removeTabViewItem:notepage]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9096 } |
|
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
|
9097 DW_LOCAL_POOL_OUT; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9098 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9099 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9100 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9101 * Queries the currently visible page ID. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9102 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9103 * handle: Handle to the notebook widget. |
|
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 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
|
9106 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9107 DWNotebook *notebook = handle; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9108 DWNotebookPage *notepage = (DWNotebookPage *)[notebook selectedTabViewItem]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9109 return [notepage pageid]; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9110 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9111 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9112 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9113 * Sets the currently visibale page ID. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9114 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9115 * handle: Handle to the notebook widget. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9116 * 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
|
9117 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9118 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
|
9119 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9120 DWNotebook *notebook = handle; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9121 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
|
9122 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9123 if(notepage != nil) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9124 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9125 [notebook selectTabViewItem:notepage]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9126 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9127 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9128 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9129 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9130 * 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
|
9131 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9132 * handle: Notebook handle. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9133 * 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
|
9134 * 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
|
9135 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9136 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
|
9137 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9138 DWNotebook *notebook = handle; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9139 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
|
9140 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9141 if(notepage != nil) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9142 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9143 [notepage setLabel:[ NSString stringWithUTF8String:text ]]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9144 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9145 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9146 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9147 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9148 * 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
|
9149 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9150 * handle: Notebook handle. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9151 * 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
|
9152 * 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
|
9153 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9154 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
|
9155 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9156 /* Note supported here... do nothing */ |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9157 } |
|
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 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9160 * 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
|
9161 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9162 * 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
|
9163 * 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
|
9164 * page: Box handle to be packed. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9165 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9166 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
|
9167 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9168 DWNotebook *notebook = handle; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9169 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
|
9170 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9171 if(notepage != nil) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9172 { |
|
667
28727d9a835c
Fix for a rather serious notebook layout bug.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
666
diff
changeset
|
9173 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
|
9174 DWBox *box = tmpbox; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
9175 |
|
667
28727d9a835c
Fix for a rather serious notebook layout bug.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
666
diff
changeset
|
9176 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
|
9177 [notepage setView:box]; |
|
1862
9c7485b1921c
Fixed object/signal/memory leak on Mac when destroying
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1861
diff
changeset
|
9178 [box autorelease]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9179 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9180 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9181 |
|
1610
48a61abcd5bb
Make sure source will build with Mac frameworks older than 10.7.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1607
diff
changeset
|
9182 #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
|
9183 #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
|
9184 #endif |
|
48a61abcd5bb
Make sure source will build with Mac frameworks older than 10.7.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1607
diff
changeset
|
9185 |
|
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 * Create a new Window Frame. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9188 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9189 * 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
|
9190 * title: The Window title. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9191 * 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
|
9192 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9193 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
|
9194 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
|
9195 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
|
9196 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
|
9197 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9198 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
|
9199 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
|
9200 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
|
9201 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
|
9202 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
|
9203 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
|
9204 defer:false]; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9205 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9206 [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
|
9207 |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9208 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
|
9209 |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9210 [window setContentView:view]; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9211 [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
|
9212 [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
|
9213 [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
|
9214 [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
|
9215 [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
|
9216 |
|
1607
d7fcea7bfcf9
Add full screen support for resizable windows on Mac 10.7.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1593
diff
changeset
|
9217 /* 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
|
9218 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
|
9219 { |
|
d7fcea7bfcf9
Add full screen support for resizable windows on Mac 10.7.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1593
diff
changeset
|
9220 [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
|
9221 } |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
9222 |
|
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
|
9223 /* 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
|
9224 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
|
9225 { |
|
014b02436c1f
Added MDI simulation code... the MDI "window" will just be a box for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
683
diff
changeset
|
9226 id object = hwndOwner; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
9227 |
|
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
|
9228 /* 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
|
9229 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
|
9230 { |
|
014b02436c1f
Added MDI simulation code... the MDI "window" will just be a box for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
683
diff
changeset
|
9231 /* 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
|
9232 [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
|
9233 [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
|
9234 } |
|
014b02436c1f
Added MDI simulation code... the MDI "window" will just be a box for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
683
diff
changeset
|
9235 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9236 DW_FUNCTION_RETURN_THIS(window); |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9237 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9238 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9239 /* |
|
651
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
9240 * 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
|
9241 * Parameters: |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
9242 * handle: Window handle of the widget. |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
9243 * function: Function pointer to be called. |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
9244 * 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
|
9245 */ |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
9246 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
|
9247 { |
|
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
|
9248 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
|
9249 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
|
9250 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
|
9251 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
|
9252 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
|
9253 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
|
9254 [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
|
9255 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
|
9256 DW_LOCAL_POOL_OUT; |
|
651
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
9257 } |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
9258 |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
9259 |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
9260 /* |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9261 * 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
|
9262 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9263 * 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
|
9264 * 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
|
9265 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9266 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
|
9267 { |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
9268 id object = handle; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
9269 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9270 if([ object isKindOfClass:[ NSView class ] ]) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9271 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9272 NSView *view = handle; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
9273 |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
9274 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
|
9275 { |
|
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
9276 [view discardCursorRects]; |
|
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
9277 } |
|
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
9278 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
|
9279 { |
|
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
9280 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
|
9281 NSCursor *cursor = [NSCursor arrowCursor]; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
9282 |
|
669
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
9283 [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
|
9284 } |
|
62aae18e7b7d
Implemented most of the listbox functions for the actual listbox control...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
668
diff
changeset
|
9285 /* 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
|
9286 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9287 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9288 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9289 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9290 * Makes the window visible. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9291 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9292 * 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
|
9293 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9294 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
|
9295 { |
|
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
|
9296 NSObject *object = handle; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
9297 |
|
1489
4c1c44af201a
Added auto-positioning and auto-sizing code for Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1478
diff
changeset
|
9298 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
|
9299 { |
|
4c1c44af201a
Added auto-positioning and auto-sizing code for Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1478
diff
changeset
|
9300 DWWindow *window = handle; |
|
4c1c44af201a
Added auto-positioning and auto-sizing code for Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1478
diff
changeset
|
9301 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
|
9302 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
|
9303 |
|
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
|
9304 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
|
9305 { |
|
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
|
9306 [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
|
9307 } |
|
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
|
9308 /* 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
|
9309 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
|
9310 { |
|
4c1c44af201a
Added auto-positioning and auto-sizing code for Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1478
diff
changeset
|
9311 /* Determine the contents size */ |
|
4c1c44af201a
Added auto-positioning and auto-sizing code for Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1478
diff
changeset
|
9312 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
|
9313 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
9314 /* 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
|
9315 * 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
|
9316 */ |
|
1489
4c1c44af201a
Added auto-positioning and auto-sizing code for Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1478
diff
changeset
|
9317 if(![window shown]) |
|
4c1c44af201a
Added auto-positioning and auto-sizing code for Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1478
diff
changeset
|
9318 { |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
9319 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
|
9320 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
|
9321 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
|
9322 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
|
9323 |
|
1489
4c1c44af201a
Added auto-positioning and auto-sizing code for Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1478
diff
changeset
|
9324 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
|
9325 |
|
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
9326 defaultx += 20; |
|
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
9327 defaulty += 20; |
|
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
9328 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
|
9329 defaultx = 20; |
|
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
9330 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
|
9331 defaulty = 20; |
|
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
9332 |
|
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
|
9333 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
|
9334 /* 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
|
9335 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
|
9336 |
|
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
|
9337 [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
|
9338 [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
|
9339 } |
|
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
|
9340 [[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
|
9341 [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
|
9342 |
|
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
|
9343 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
|
9344 { |
|
d056a50196a9
Attempted fix at Mac textured background repeat problems. Thanks to Christoph Sinai
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1779
diff
changeset
|
9345 /* 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
|
9346 [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
|
9347 [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
|
9348 } |
|
1795
9304241b7b33
Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1792
diff
changeset
|
9349 if(defaultitem) |
|
9304241b7b33
Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1792
diff
changeset
|
9350 { |
|
9304241b7b33
Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1792
diff
changeset
|
9351 /* 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
|
9352 [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
|
9353 } |
|
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
|
9354 } |
|
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
|
9355 return 0; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9356 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9357 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9358 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9359 * Makes the window invisible. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9360 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9361 * 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
|
9362 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9363 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
|
9364 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9365 NSObject *object = handle; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
9366 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9367 if([ object isKindOfClass:[ NSWindow class ] ]) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9368 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9369 NSWindow *window = handle; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
9370 |
|
733
8d5e5b89725f
Fixed the crashing issue with dw_color_choose() it now functions properly.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
732
diff
changeset
|
9371 [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
|
9372 } |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9373 return 0; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9374 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9375 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9376 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9377 * 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
|
9378 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9379 * handle: The window (widget) handle. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9380 * 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
|
9381 * 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
|
9382 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9383 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
|
9384 { |
|
739
a0aec9a56914
Font and color improvements... including implementing dw_window_set_font().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
738
diff
changeset
|
9385 id object = handle; |
|
a0aec9a56914
Font and color improvements... including implementing dw_window_set_font().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
738
diff
changeset
|
9386 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
|
9387 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
|
9388 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
|
9389 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
|
9390 |
|
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
|
9391 /* 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
|
9392 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
|
9393 { |
|
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
|
9394 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
|
9395 } |
|
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
|
9396 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
|
9397 { |
|
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
|
9398 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
|
9399 } |
|
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
|
9400 |
|
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
|
9401 /* 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
|
9402 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
|
9403 { |
|
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
|
9404 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
|
9405 } |
|
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
|
9406 /* 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
|
9407 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
|
9408 { |
|
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
|
9409 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
|
9410 |
|
1849
b5e1ccc76e58
Added code to set the foreground color on Mac buttons...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1848
diff
changeset
|
9411 [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
|
9412 [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
|
9413 } |
|
1849
b5e1ccc76e58
Added code to set the foreground color on Mac buttons...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1848
diff
changeset
|
9414 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
|
9415 { |
|
b5e1ccc76e58
Added code to set the foreground color on Mac buttons...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1848
diff
changeset
|
9416 [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
|
9417 } |
|
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
|
9418 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
|
9419 { |
|
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
|
9420 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
|
9421 |
|
1848
68f923e57542
Attempt at resetting default colors with DW_CLR_DEFAULT on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1843
diff
changeset
|
9422 [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
|
9423 } |
|
a0aec9a56914
Font and color improvements... including implementing dw_window_set_font().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
738
diff
changeset
|
9424 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
|
9425 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9426 DWBox *box = object; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
9427 |
|
1848
68f923e57542
Attempt at resetting default colors with DW_CLR_DEFAULT on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1843
diff
changeset
|
9428 [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
|
9429 } |
|
810
746cdd753e7a
Added coloring support for the Container/Tree/Listbox controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
809
diff
changeset
|
9430 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
|
9431 { |
|
746cdd753e7a
Added coloring support for the Container/Tree/Listbox controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
809
diff
changeset
|
9432 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
|
9433 |
|
1848
68f923e57542
Attempt at resetting default colors with DW_CLR_DEFAULT on Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1843
diff
changeset
|
9434 [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
|
9435 [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
|
9436 } |
|
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
|
9437 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
|
9438 { |
|
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
|
9439 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
|
9440 [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
|
9441 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
|
9442 [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
|
9443 } |
|
739
a0aec9a56914
Font and color improvements... including implementing dw_window_set_font().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
738
diff
changeset
|
9444 return 0; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9445 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9446 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9447 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9448 * 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
|
9449 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9450 * handle: The window (widget) handle. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9451 * 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
|
9452 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9453 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
|
9454 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9455 return 0; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9456 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9457 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9458 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9459 * 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
|
9460 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9461 * handle: Window (widget) handle. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9462 * width: New width in pixels. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9463 * height: New height in pixels. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9464 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9465 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
|
9466 { |
|
1778
e71ab68198ce
Minor cleanups for the Mac status text changes for 10.8.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1776
diff
changeset
|
9467 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
|
9468 |
|
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
|
9469 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
|
9470 { |
|
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
|
9471 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
|
9472 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
|
9473 |
|
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
|
9474 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
|
9475 { |
|
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
|
9476 IMP issm = [window methodForSelector: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
|
9477 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
|
9478 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
|
9479 |
|
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
|
9480 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
|
9481 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
|
9482 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
|
9483 |
|
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
|
9484 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
|
9485 } |
|
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
|
9486 } |
|
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
|
9487 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
|
9488 { |
|
bb3b2d804f0e
Working on fonts some more.... setting a default label font that is smaller.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
739
diff
changeset
|
9489 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
|
9490 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
|
9491 |
|
e71ab68198ce
Minor cleanups for the Mac status text changes for 10.8.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1776
diff
changeset
|
9492 [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
|
9493 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
|
9494 { |
|
e71ab68198ce
Minor cleanups for the Mac status text changes for 10.8.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1776
diff
changeset
|
9495 [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
|
9496 } |
|
1788
9d499b162fe1
Discovered a breakage in OS/2 functionality when building
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1786
diff
changeset
|
9497 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
|
9498 { |
|
9d499b162fe1
Discovered a breakage in OS/2 functionality when building
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1786
diff
changeset
|
9499 [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
|
9500 } |
|
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
|
9501 } |
|
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
|
9502 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
|
9503 { |
|
48f8efba898f
Filled in most of the remaining MLE and container functions... the remaining few
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
674
diff
changeset
|
9504 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
|
9505 [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
|
9506 } |
|
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
|
9507 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
|
9508 { |
|
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
|
9509 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
|
9510 |
|
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
|
9511 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
|
9512 { |
|
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
|
9513 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
|
9514 [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
|
9515 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
|
9516 [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
|
9517 } |
|
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
|
9518 } |
|
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
|
9519 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
|
9520 { |
|
c969db49606e
Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1313
diff
changeset
|
9521 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
|
9522 { |
|
c969db49606e
Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1313
diff
changeset
|
9523 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
|
9524 [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
|
9525 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
|
9526 [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
|
9527 } |
|
c969db49606e
Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1313
diff
changeset
|
9528 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
|
9529 { |
|
c969db49606e
Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1313
diff
changeset
|
9530 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
|
9531 [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
|
9532 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
|
9533 [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
|
9534 } |
|
c969db49606e
Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1313
diff
changeset
|
9535 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9536 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9537 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9538 /* |
|
1795
9304241b7b33
Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1792
diff
changeset
|
9539 * 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
|
9540 * Parameters: |
|
9304241b7b33
Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1792
diff
changeset
|
9541 * 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
|
9542 * Remarks: |
|
9304241b7b33
Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1792
diff
changeset
|
9543 * 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
|
9544 */ |
|
9304241b7b33
Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1792
diff
changeset
|
9545 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
|
9546 { |
|
9304241b7b33
Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1792
diff
changeset
|
9547 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
|
9548 |
|
1795
9304241b7b33
Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1792
diff
changeset
|
9549 [[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
|
9550 } |
|
9304241b7b33
Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1792
diff
changeset
|
9551 |
|
9304241b7b33
Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1792
diff
changeset
|
9552 /* |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9553 * 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
|
9554 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9555 * window: Toplevel window or dialog. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9556 * 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
|
9557 * Remarks: |
|
9304241b7b33
Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1792
diff
changeset
|
9558 * 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
|
9559 */ |
|
766
82cde14ec084
Enable recalculating the key view loop (keyboard focus list) automatically.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
763
diff
changeset
|
9560 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
|
9561 { |
|
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
|
9562 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
|
9563 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
|
9564 |
|
872
13debcad9757
Another test fix at reported crash in dw_window_default().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
867
diff
changeset
|
9565 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
|
9566 { |
|
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
|
9567 [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
|
9568 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9569 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9570 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9571 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9572 * 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
|
9573 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9574 * 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
|
9575 * 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
|
9576 */ |
|
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
|
9577 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
|
9578 { |
|
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
|
9579 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
|
9580 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
|
9581 |
|
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
|
9582 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
|
9583 { |
|
fc6a626a96cc
Initial groupbox support. Sizing of the content frame is not quite right yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
768
diff
changeset
|
9584 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
|
9585 { |
|
fc6a626a96cc
Initial groupbox support. Sizing of the content frame is not quite right yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
768
diff
changeset
|
9586 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
|
9587 |
|
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
|
9588 [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
|
9589 } |
|
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
|
9590 } |
|
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
|
9591 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
|
9592 { |
|
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
|
9593 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
|
9594 { |
|
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
|
9595 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
|
9596 } |
|
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
|
9597 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
|
9598 { |
|
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
|
9599 /* 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
|
9600 * 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
|
9601 */ |
|
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
|
9602 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
|
9603 } |
|
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
|
9604 [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
|
9605 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9606 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9607 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9608 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9609 * 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
|
9610 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9611 * handle: Handle to receive mouse input. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9612 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9613 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
|
9614 { |
|
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
|
9615 /* 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
|
9616 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9617 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9618 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9619 * Releases previous mouse capture. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9620 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9621 void API dw_window_release(void) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9622 { |
|
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
|
9623 /* 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
|
9624 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9625 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9626 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9627 * 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
|
9628 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9629 * handle: The window handle to destroy. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9630 * 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
|
9631 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9632 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
|
9633 { |
|
686
218d676baf7f
Implemented dw_window_reparent using the method used for MDI simulation.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
685
diff
changeset
|
9634 id object = handle; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
9635 |
|
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
|
9636 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
|
9637 { |
|
218d676baf7f
Implemented dw_window_reparent using the method used for MDI simulation.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
685
diff
changeset
|
9638 /* 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
|
9639 * 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
|
9640 * 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
|
9641 */ |
|
218d676baf7f
Implemented dw_window_reparent using the method used for MDI simulation.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
685
diff
changeset
|
9642 NSWindow *window = handle; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
9643 |
|
686
218d676baf7f
Implemented dw_window_reparent using the method used for MDI simulation.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
685
diff
changeset
|
9644 /* 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
|
9645 if(newparent) |
|
218d676baf7f
Implemented dw_window_reparent using the method used for MDI simulation.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
685
diff
changeset
|
9646 { |
|
218d676baf7f
Implemented dw_window_reparent using the method used for MDI simulation.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
685
diff
changeset
|
9647 object = newparent; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
9648 |
|
686
218d676baf7f
Implemented dw_window_reparent using the method used for MDI simulation.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
685
diff
changeset
|
9649 /* 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
|
9650 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
|
9651 { |
|
218d676baf7f
Implemented dw_window_reparent using the method used for MDI simulation.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
685
diff
changeset
|
9652 /* 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
|
9653 [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
|
9654 [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
|
9655 return; |
|
218d676baf7f
Implemented dw_window_reparent using the method used for MDI simulation.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
685
diff
changeset
|
9656 } |
|
218d676baf7f
Implemented dw_window_reparent using the method used for MDI simulation.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
685
diff
changeset
|
9657 } |
|
218d676baf7f
Implemented dw_window_reparent using the method used for MDI simulation.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
685
diff
changeset
|
9658 /* 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
|
9659 [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
|
9660 [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
|
9661 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9662 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9663 |
|
1051
6919854298fd
Added dw_font_choose() on Windows for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1050
diff
changeset
|
9664 /* 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
|
9665 * Parameters: |
|
6919854298fd
Added dw_font_choose() on Windows for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1050
diff
changeset
|
9666 * 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
|
9667 * Returns: |
|
1051
6919854298fd
Added dw_font_choose() on Windows for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1050
diff
changeset
|
9668 * 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
|
9669 */ |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9670 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
|
9671 { |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9672 /* 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
|
9673 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
|
9674 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
|
9675 DWDialog *dialog; |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9676 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
|
9677 |
|
1050
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9678 if(currfont) |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9679 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
|
9680 |
|
1050
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9681 if(fontDlg) |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9682 { |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9683 dialog = [fontDlg dialog]; |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9684 /* 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
|
9685 if(dialog) |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9686 { |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9687 return NULL; |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9688 } |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9689 } |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9690 else |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9691 { |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9692 [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
|
9693 fontManager = [NSFontManager sharedFontManager]; |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9694 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
|
9695 } |
|
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
|
9696 |
|
1050
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9697 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
|
9698 if(font) |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9699 [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
|
9700 else |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9701 [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
|
9702 [fontDlg setDialog:dialog]; |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9703 [fontDlg setFontManager:fontManager]; |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9704 [fontManager orderFrontFontPanel:fontManager]; |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9705 |
|
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
|
9706 |
|
1050
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9707 /* 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
|
9708 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
|
9709 if(font) |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9710 { |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9711 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
|
9712 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
|
9713 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
|
9714 } |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9715 return NULL; |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9716 } |
|
48f43c975533
Added dw_font_choose() on the Mac for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1048
diff
changeset
|
9717 |
|
1410
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9718 /* 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
|
9719 * 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
|
9720 */ |
|
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9721 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
|
9722 { |
|
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9723 /* 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
|
9724 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
|
9725 { |
|
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9726 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
|
9727 |
|
1410
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9728 /* 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
|
9729 * 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
|
9730 */ |
|
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9731 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
|
9732 { |
|
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9733 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
|
9734 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
|
9735 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
9736 |
|
1410
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9737 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
|
9738 { |
|
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9739 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
|
9740 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
|
9741 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
|
9742 |
|
1410
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9743 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
|
9744 { |
|
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9745 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
|
9746 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
|
9747 } |
|
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9748 } |
|
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9749 } |
|
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9750 return NULL; |
|
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9751 } |
|
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9752 |
|
650
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 * 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
|
9755 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9756 * handle: The window (widget) handle. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9757 * 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
|
9758 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9759 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
|
9760 { |
|
744
9882b0dfa304
Added an internal Mac function for setting the default Dynamic Windows font.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
743
diff
changeset
|
9761 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
|
9762 |
|
744
9882b0dfa304
Added an internal Mac function for setting the default Dynamic Windows font.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
743
diff
changeset
|
9763 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
|
9764 { |
|
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
|
9765 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
|
9766 if([object window]) |
|
673
6d0f0dc7ff7c
Some minor font fixes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
672
diff
changeset
|
9767 { |
|
744
9882b0dfa304
Added an internal Mac function for setting the default Dynamic Windows font.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
743
diff
changeset
|
9768 [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
|
9769 [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
|
9770 [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
|
9771 } |
|
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
|
9772 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
|
9773 { |
|
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
|
9774 [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
|
9775 } |
|
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
|
9776 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
|
9777 { |
|
9882b0dfa304
Added an internal Mac function for setting the default Dynamic Windows font.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
743
diff
changeset
|
9778 [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
|
9779 [[object cell] setFont:font]; |
|
673
6d0f0dc7ff7c
Some minor font fixes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
672
diff
changeset
|
9780 } |
|
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
|
9781 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
|
9782 { |
|
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
|
9783 DWRender *render = object; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
9784 |
|
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
|
9785 [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
|
9786 } |
|
1410
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9787 else |
|
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9788 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
|
9789 /* 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
|
9790 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
|
9791 |
|
1410
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9792 /* 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
|
9793 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
|
9794 { |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
9795 _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
|
9796 /* 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
|
9797 _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
|
9798 } |
|
1410
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9799 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
|
9800 } |
|
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9801 return DW_ERROR_UNKNOWN; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9802 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9803 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9804 /* |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
9805 * Returns the current font for the specified window |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
9806 * Parameters: |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
9807 * 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
|
9808 */ |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
9809 char * API dw_window_get_font(HWND handle) |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
9810 { |
|
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
|
9811 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
|
9812 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
|
9813 |
|
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
|
9814 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
|
9815 { |
|
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
|
9816 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
|
9817 } |
|
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
|
9818 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
|
9819 { |
|
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
|
9820 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
|
9821 } |
|
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
|
9822 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
|
9823 { |
|
1041
6a57bf20d8f9
Return displayName property instead of fontName property in dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1040
diff
changeset
|
9824 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
|
9825 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
|
9826 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
|
9827 } |
|
a0aec9a56914
Font and color improvements... including implementing dw_window_set_font().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
738
diff
changeset
|
9828 return NULL; |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
9829 } |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
9830 |
|
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
9831 /* |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9832 * 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
|
9833 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9834 * handle: The window handle to destroy. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9835 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9836 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
|
9837 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
|
9838 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
|
9839 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
|
9840 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9841 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
|
9842 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
|
9843 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
|
9844 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
|
9845 |
|
1375
611893219ba9
Implemented dw_menu_delete_item() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1340
diff
changeset
|
9846 /* Handle destroying a top-level window */ |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9847 if([ object isKindOfClass:[ NSWindow class ] ]) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9848 { |
|
1313
9f12bc79924b
Autorelease fixes for Mac allowing the objects to dealloc when destroyed.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1312
diff
changeset
|
9849 DWWindow *window = handle; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9850 [window close]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9851 } |
|
1375
611893219ba9
Implemented dw_menu_delete_item() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1340
diff
changeset
|
9852 /* 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
|
9853 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
|
9854 { |
|
611893219ba9
Implemented dw_menu_delete_item() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1340
diff
changeset
|
9855 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
|
9856 |
|
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
|
9857 [menu removeItem:object]; |
|
1375
611893219ba9
Implemented dw_menu_delete_item() on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1340
diff
changeset
|
9858 } |
|
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
|
9859 /* 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
|
9860 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
|
9861 { |
|
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
|
9862 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
|
9863 |
|
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
|
9864 /* 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
|
9865 * 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
|
9866 */ |
|
1549
ca6be9c48fff
Implemented auto-sizing containers on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1543
diff
changeset
|
9867 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
|
9868 && [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
|
9869 { |
|
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
|
9870 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
|
9871 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
|
9872 } |
|
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
|
9873 |
|
1099
d1cea9be1436
Fixed dw_window_destroy() with groupboxes on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1098
diff
changeset
|
9874 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
|
9875 { |
|
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
|
9876 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
|
9877 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
|
9878 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
|
9879 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
|
9880 |
|
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
|
9881 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
|
9882 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
|
9883 |
|
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
|
9884 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
|
9885 { |
|
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
|
9886 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
|
9887 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
|
9888 } |
|
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
|
9889 |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9890 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
|
9891 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9892 [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
|
9893 |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9894 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
|
9895 { |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9896 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
|
9897 |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9898 /* 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
|
9899 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
|
9900 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9901 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
|
9902 } |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9903 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
|
9904 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9905 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
|
9906 } |
|
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
|
9907 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9908 |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9909 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
|
9910 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
|
9911 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
|
9912 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
|
9913 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
|
9914 else |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9915 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
|
9916 |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9917 /* 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
|
9918 _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
|
9919 } |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9920 } |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9921 } |
|
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
|
9922 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
|
9923 DW_FUNCTION_RETURN_THIS(retval); |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9924 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9925 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9926 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9927 * 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
|
9928 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9929 * handle: Handle to the window. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9930 * Returns: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9931 * 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
|
9932 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9933 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
|
9934 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
|
9935 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
|
9936 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
|
9937 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9938 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
|
9939 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
|
9940 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
|
9941 |
|
808
c0641a6d4258
Similar fix for dw_window_get_text().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
807
diff
changeset
|
9942 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
|
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 window = object; |
|
808
c0641a6d4258
Similar fix for dw_window_get_text().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
807
diff
changeset
|
9945 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
|
9946 |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9947 retval = strdup([ nsstr UTF8String ]); |
|
808
c0641a6d4258
Similar fix for dw_window_get_text().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
807
diff
changeset
|
9948 } |
|
c0641a6d4258
Similar fix for dw_window_get_text().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
807
diff
changeset
|
9949 else if([ object isKindOfClass:[ NSControl class ] ]) |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9950 { |
|
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
|
9951 NSControl *control = object; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9952 NSString *nsstr = [ control stringValue]; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
9953 |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9954 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
|
9955 } |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9956 DW_FUNCTION_RETURN_THIS(retval); |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9957 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9958 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9959 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9960 * 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
|
9961 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9962 * handle: Handle to the window. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
9963 * 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
|
9964 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
9965 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
|
9966 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
|
9967 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
|
9968 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
|
9969 { |
|
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_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
|
9971 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
|
9972 |
|
807
f7016a38bedd
Fix for dw_window_set_text() on buttons not working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
806
diff
changeset
|
9973 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
|
9974 [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
|
9975 else if([ object isKindOfClass:[ NSControl class ] ]) |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9976 { |
|
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
|
9977 NSControl *control = object; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9978 [control setStringValue:[ NSString stringWithUTF8String:text ]]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
9979 } |
|
953
2dfc06afc7d3
Support dw_window_set_text() for groupboxes
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
952
diff
changeset
|
9980 else if([object isMemberOfClass:[DWGroupBox class]]) |
|
2dfc06afc7d3
Support dw_window_set_text() for groupboxes
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
952
diff
changeset
|
9981 { |
|
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
|
9982 DWGroupBox *groupbox = object; |
|
953
2dfc06afc7d3
Support dw_window_set_text() for groupboxes
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
952
diff
changeset
|
9983 [groupbox setTitle:[NSString stringWithUTF8String:text]]; |
|
2dfc06afc7d3
Support dw_window_set_text() for groupboxes
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
952
diff
changeset
|
9984 } |
|
1410
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9985 else |
|
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9986 return; |
|
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9987 /* 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
|
9988 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
|
9989 |
|
1410
c607fd86e5c2
Initial code on the Mac to automatically calculate widget required sizes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1400
diff
changeset
|
9990 /* 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
|
9991 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
|
9992 { |
|
1792
b0bdec1b820c
Similar fixes to the Mac one on OS/2 and Windows....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1791
diff
changeset
|
9993 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
|
9994 |
|
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
9995 _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
|
9996 |
|
1792
b0bdec1b820c
Similar fixes to the Mac one on OS/2 and Windows....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1791
diff
changeset
|
9997 /* 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
|
9998 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
|
9999 (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
|
10000 { |
|
b0bdec1b820c
Similar fixes to the Mac one on OS/2 and Windows....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1791
diff
changeset
|
10001 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
|
10002 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
|
10003 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
|
10004 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
|
10005 /* 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
|
10006 _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
|
10007 } |
|
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
|
10008 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
10009 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10010 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10011 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10012 /* |
|
1389
0512fbb08abf
Added dw_window_set_tooltip() for adding bubble help to most controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1385
diff
changeset
|
10013 * 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
|
10014 * Parameters: |
|
0512fbb08abf
Added dw_window_set_tooltip() for adding bubble help to most controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1385
diff
changeset
|
10015 * 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
|
10016 * 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
|
10017 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
10018 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
|
10019 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
|
10020 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
|
10021 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
|
10022 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
10023 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
|
10024 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
|
10025 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
|
10026 [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
|
10027 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
|
10028 [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
|
10029 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
|
10030 } |
|
0512fbb08abf
Added dw_window_set_tooltip() for adding bubble help to most controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1385
diff
changeset
|
10031 |
|
0512fbb08abf
Added dw_window_set_tooltip() for adding bubble help to most controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1385
diff
changeset
|
10032 /* |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10033 * Disables given window (widget). |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10034 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10035 * handle: Handle to the window. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10036 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
10037 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
|
10038 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
|
10039 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
|
10040 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
|
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 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
|
10043 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
|
10044 |
|
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
|
10045 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
|
10046 { |
|
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
|
10047 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
|
10048 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
|
10049 } |
|
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
|
10050 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
|
10051 { |
|
107e38a29eeb
Allow dw_window_enable/disable() to work on menu items on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1275
diff
changeset
|
10052 [object setEnabled:NO]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10053 } |
|
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
|
10054 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
|
10055 { |
|
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
|
10056 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
|
10057 |
|
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
|
10058 [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
|
10059 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
10060 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10061 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10062 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10063 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10064 * Enables given window (widget). |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10065 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10066 * handle: Handle to the window. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10067 */ |
|
1955
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_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
|
10069 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
|
10070 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
|
10071 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
|
10072 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
10073 DW_FUNCTION_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
|
10074 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
|
10075 |
|
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
|
10076 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
|
10077 { |
|
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
|
10078 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
|
10079 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
|
10080 } |
|
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
|
10081 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
|
10082 { |
|
107e38a29eeb
Allow dw_window_enable/disable() to work on menu items on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1275
diff
changeset
|
10083 [object setEnabled:YES]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10084 } |
|
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
|
10085 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
|
10086 { |
|
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
|
10087 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
|
10088 |
|
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
|
10089 [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
|
10090 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
10091 DW_FUNCTION_RETURN_NOTHING; |
|
650
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 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10094 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10095 * 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
|
10096 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10097 * handle: Handle to the window. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10098 * 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
|
10099 * (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
|
10100 * 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
|
10101 * 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
|
10102 * 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
|
10103 */ |
|
685
314a12dccd20
Cleanups for conflicts with "id" which is a keyword in Objective-C.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
684
diff
changeset
|
10104 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
|
10105 { |
|
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
|
10106 id object = handle; |
|
1922
a2a8145f3148
Turn off smart text and quote substitution on MLE.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1914
diff
changeset
|
10107 |
|
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
|
10108 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
|
10109 { |
|
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
|
10110 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
|
10111 { |
|
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
|
10112 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
|
10113 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
|
10114 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
|
10115 |
|
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
|
10116 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
|
10117 { |
|
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
|
10118 [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
|
10119 } |
|
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
|
10120 /* 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
|
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 |
|
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
|
10123 /* 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
|
10124 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
|
10125 { |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
10126 _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
|
10127 /* 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
|
10128 _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
|
10129 } |
|
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
|
10130 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
|
10131 } |
|
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
|
10132 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
|
10133 dw_window_set_bitmap(handle, cid, NULL); |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10134 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10135 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10136 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10137 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10138 * 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
|
10139 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10140 * handle: Handle to the window. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10141 * 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
|
10142 * (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
|
10143 * 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
|
10144 * 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
|
10145 * 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
|
10146 */ |
|
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
|
10147 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
|
10148 { |
|
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
|
10149 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
|
10150 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
|
10151 |
|
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
|
10152 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
|
10153 { |
|
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
|
10154 NSImage *bitmap = nil; |
|
1922
a2a8145f3148
Turn off smart text and quote substitution on MLE.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1914
diff
changeset
|
10155 |
|
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
|
10156 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
|
10157 { |
|
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
|
10158 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
|
10159 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
|
10160 |
|
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
|
10161 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
|
10162 |
|
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
|
10163 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
|
10164 { |
|
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
|
10165 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
|
10166 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
|
10167 } |
|
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
|
10168 } |
|
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
|
10169 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
|
10170 { |
|
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
|
10171 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
|
10172 } |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
10173 |
|
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
|
10174 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
|
10175 { |
|
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
|
10176 [object setImage:bitmap]; |
|
1922
a2a8145f3148
Turn off smart text and quote substitution on MLE.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1914
diff
changeset
|
10177 |
|
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
|
10178 /* 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
|
10179 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
|
10180 |
|
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
|
10181 /* 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
|
10182 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
|
10183 { |
|
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
|
10184 _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
|
10185 /* 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
|
10186 _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
|
10187 } |
|
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
|
10188 } |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10189 } |
|
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
|
10190 DW_LOCAL_POOL_OUT; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10191 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10192 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10193 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10194 * 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
|
10195 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10196 * handle: Handle to the window. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10197 * 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
|
10198 */ |
|
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
|
10199 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
|
10200 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10201 /* 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
|
10202 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10203 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10204 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10205 * 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
|
10206 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10207 * handle: Handle to the parent window. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10208 * id: Integer ID of the child. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10209 */ |
|
685
314a12dccd20
Cleanups for conflicts with "id" which is a keyword in Objective-C.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
684
diff
changeset
|
10210 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
|
10211 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10212 NSObject *object = handle; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10213 NSView *view = handle; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10214 if([ object isKindOfClass:[ NSWindow class ] ]) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10215 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10216 NSWindow *window = handle; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10217 view = [window contentView]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10218 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10219 return [view viewWithTag:cid]; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10220 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10221 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10222 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10223 * 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
|
10224 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10225 * handle: The window handle to minimize. |
|
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 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
|
10228 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10229 NSWindow *window = handle; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10230 [window miniaturize:nil]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10231 return 0; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10232 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10233 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10234 /* 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
|
10235 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10236 * 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
|
10237 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10238 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
|
10239 { |
|
1101
d7eafaa054ab
Added support for dw_window_redraw() causing splitbar panes to redraw without
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1100
diff
changeset
|
10240 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
|
10241 [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
|
10242 [[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
|
10243 #ifndef BUILDING_FOR_MOJAVE |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10244 [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
|
10245 #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
|
10246 [window setRedraw:NO]; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10247 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10248 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10249 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10250 * Makes the window topmost. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10251 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10252 * 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
|
10253 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10254 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
|
10255 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10256 NSWindow *window = handle; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10257 [window orderFront:nil]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10258 return 0; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10259 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10260 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10261 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10262 * Makes the window bottommost. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10263 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10264 * 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
|
10265 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10266 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
|
10267 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10268 NSWindow *window = handle; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10269 [window orderBack:nil]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10270 return 0; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10271 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10272 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10273 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10274 * 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
|
10275 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10276 * handle: Window (widget) handle. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10277 * width: New width in pixels. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10278 * height: New height in pixels. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10279 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
10280 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
|
10281 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
|
10282 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
|
10283 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
|
10284 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
10285 DW_FUNCTION_INIT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10286 NSObject *object = handle; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
10287 |
|
1494
cf960e266444
Fixes for gravity obstacles on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1492
diff
changeset
|
10288 if([ object isMemberOfClass:[ DWWindow class ] ]) |
|
cf960e266444
Fixes for gravity obstacles on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1492
diff
changeset
|
10289 { |
|
cf960e266444
Fixes for gravity obstacles on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1492
diff
changeset
|
10290 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
|
10291 Box *thisbox; |
|
1478
7216f4301364
Fix mixing frame and content sizes on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1474
diff
changeset
|
10292 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
|
10293 |
|
1478
7216f4301364
Fix mixing frame and content sizes on the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1474
diff
changeset
|
10294 /* 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
|
10295 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
|
10296 |
|
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
|
10297 /* |
|
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
|
10298 * 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
|
10299 * 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
|
10300 */ |
|
1906
fac81560eb09
Fix a number of warning generated by the new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1905
diff
changeset
|
10301 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
|
10302 { |
|
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
|
10303 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
|
10304 |
|
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
|
10305 /* Calculate space requirements */ |
|
1446
0d4fdf646caf
Fix clang integer conversion warning on 64bit Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1442
diff
changeset
|
10306 _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
|
10307 |
|
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
|
10308 /* 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
|
10309 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
|
10310 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
|
10311 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
10312 |
|
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
|
10313 /* 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
|
10314 [window setContentSize:content.size]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10315 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
10316 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10317 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10318 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10319 /* |
|
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
|
10320 * 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
|
10321 * 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
|
10322 * 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
|
10323 * 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
|
10324 * 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
|
10325 */ |
|
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
|
10326 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
|
10327 { |
|
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
|
10328 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
|
10329 |
|
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
|
10330 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
|
10331 { |
|
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
|
10332 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
|
10333 |
|
1906
fac81560eb09
Fix a number of warning generated by the new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1905
diff
changeset
|
10334 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
|
10335 { |
|
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
|
10336 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
|
10337 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
|
10338 |
|
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
|
10339 /* 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
|
10340 _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
|
10341 |
|
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
|
10342 /* 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
|
10343 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
|
10344 |
|
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
|
10345 /* 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
|
10346 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
|
10347 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
|
10348 } |
|
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
|
10349 } |
|
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
|
10350 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
|
10351 { |
|
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
|
10352 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
|
10353 |
|
1906
fac81560eb09
Fix a number of warning generated by the new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1905
diff
changeset
|
10354 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
|
10355 { |
|
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
|
10356 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
|
10357 |
|
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
|
10358 /* 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
|
10359 _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
|
10360 |
|
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
|
10361 /* 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
|
10362 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
|
10363 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
|
10364 } |
|
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
|
10365 } |
|
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
|
10366 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
|
10367 _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
|
10368 } |
|
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
|
10369 |
|
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
|
10370 /* |
|
1474
cd3d7e341467
Initial implementation of dw_window_set_gravity() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1457
diff
changeset
|
10371 * 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
|
10372 * 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
|
10373 * Parameters: |
|
cd3d7e341467
Initial implementation of dw_window_set_gravity() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1457
diff
changeset
|
10374 * handle: Window (widget) handle. |
|
cd3d7e341467
Initial implementation of dw_window_set_gravity() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1457
diff
changeset
|
10375 * 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
|
10376 * 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
|
10377 */ |
|
cd3d7e341467
Initial implementation of dw_window_set_gravity() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1457
diff
changeset
|
10378 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
|
10379 { |
|
cd3d7e341467
Initial implementation of dw_window_set_gravity() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1457
diff
changeset
|
10380 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
|
10381 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
|
10382 } |
|
cd3d7e341467
Initial implementation of dw_window_set_gravity() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1457
diff
changeset
|
10383 |
|
cd3d7e341467
Initial implementation of dw_window_set_gravity() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1457
diff
changeset
|
10384 /* 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
|
10385 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
|
10386 { |
|
cd3d7e341467
Initial implementation of dw_window_set_gravity() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1457
diff
changeset
|
10387 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
|
10388 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
|
10389 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
|
10390 |
|
1474
cd3d7e341467
Initial implementation of dw_window_set_gravity() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1457
diff
changeset
|
10391 /* Do any gravity calculations */ |
|
cd3d7e341467
Initial implementation of dw_window_set_gravity() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1457
diff
changeset
|
10392 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
|
10393 { |
|
cd3d7e341467
Initial implementation of dw_window_set_gravity() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1457
diff
changeset
|
10394 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
|
10395 |
|
1474
cd3d7e341467
Initial implementation of dw_window_set_gravity() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1457
diff
changeset
|
10396 /* Handle horizontal center gravity */ |
|
cd3d7e341467
Initial implementation of dw_window_set_gravity() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1457
diff
changeset
|
10397 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
|
10398 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
|
10399 /* Handle right gravity */ |
|
cd3d7e341467
Initial implementation of dw_window_set_gravity() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1457
diff
changeset
|
10400 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
|
10401 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
|
10402 /* Handle vertical center gravity */ |
|
cd3d7e341467
Initial implementation of dw_window_set_gravity() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1457
diff
changeset
|
10403 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
|
10404 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
|
10405 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
|
10406 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
|
10407 |
|
1474
cd3d7e341467
Initial implementation of dw_window_set_gravity() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1457
diff
changeset
|
10408 /* Save the new values */ |
|
cd3d7e341467
Initial implementation of dw_window_set_gravity() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1457
diff
changeset
|
10409 *x = newx; |
|
cd3d7e341467
Initial implementation of dw_window_set_gravity() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1457
diff
changeset
|
10410 *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
|
10411 } |
|
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
|
10412 /* 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
|
10413 if((horz | vert) & DW_GRAV_OBSTACLES) |
|
cf960e266444
Fixes for gravity obstacles on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1492
diff
changeset
|
10414 { |
|
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
|
10415 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
|
10416 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
|
10417 |
|
1494
cf960e266444
Fixes for gravity obstacles on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1492
diff
changeset
|
10418 if(horz & DW_GRAV_OBSTACLES) |
|
cf960e266444
Fixes for gravity obstacles on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1492
diff
changeset
|
10419 { |
|
cf960e266444
Fixes for gravity obstacles on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1492
diff
changeset
|
10420 if((horz & 0xf) == DW_GRAV_LEFT) |
|
cf960e266444
Fixes for gravity obstacles on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1492
diff
changeset
|
10421 *x += visiblerect.origin.x; |
|
cf960e266444
Fixes for gravity obstacles on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1492
diff
changeset
|
10422 else if((horz & 0xf) == DW_GRAV_RIGHT) |
|
cf960e266444
Fixes for gravity obstacles on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1492
diff
changeset
|
10423 *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
|
10424 } |
|
cf960e266444
Fixes for gravity obstacles on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1492
diff
changeset
|
10425 if(vert & DW_GRAV_OBSTACLES) |
|
cf960e266444
Fixes for gravity obstacles on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1492
diff
changeset
|
10426 { |
|
cf960e266444
Fixes for gravity obstacles on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1492
diff
changeset
|
10427 if((vert & 0xf) == DW_GRAV_BOTTOM) |
|
cf960e266444
Fixes for gravity obstacles on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1492
diff
changeset
|
10428 *y += visiblerect.origin.y; |
|
cf960e266444
Fixes for gravity obstacles on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1492
diff
changeset
|
10429 else if((vert & 0xf) == DW_GRAV_TOP) |
|
cf960e266444
Fixes for gravity obstacles on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1492
diff
changeset
|
10430 *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
|
10431 } |
|
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
|
10432 } |
|
1474
cd3d7e341467
Initial implementation of dw_window_set_gravity() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1457
diff
changeset
|
10433 } |
|
cd3d7e341467
Initial implementation of dw_window_set_gravity() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1457
diff
changeset
|
10434 |
|
cd3d7e341467
Initial implementation of dw_window_set_gravity() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1457
diff
changeset
|
10435 /* |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10436 * 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
|
10437 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10438 * handle: Window (widget) handle. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10439 * 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
|
10440 * 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
|
10441 */ |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
10442 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
|
10443 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
|
10444 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
|
10445 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
|
10446 { |
|
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
10447 DW_FUNCTION_INIT; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10448 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
|
10449 |
|
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
|
10450 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
|
10451 { |
|
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
|
10452 DWWindow *window = handle; |
|
1474
cd3d7e341467
Initial implementation of dw_window_set_gravity() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1457
diff
changeset
|
10453 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
|
10454 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
|
10455 |
|
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
|
10456 /* 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
|
10457 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
|
10458 { |
|
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
|
10459 /* 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
|
10460 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
|
10461 } |
|
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
|
10462 |
|
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
|
10463 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
|
10464 _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
|
10465 |
|
1474
cd3d7e341467
Initial implementation of dw_window_set_gravity() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1457
diff
changeset
|
10466 point.x = x; |
|
cd3d7e341467
Initial implementation of dw_window_set_gravity() on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1457
diff
changeset
|
10467 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
|
10468 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10469 [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
|
10470 /* 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
|
10471 [window setShown:YES]; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10472 } |
|
1955
91541efcea10
Mac: Complete refactoring of the Mac code using a handful of macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1954
diff
changeset
|
10473 DW_FUNCTION_RETURN_NOTHING; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10474 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10475 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10476 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10477 * 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
|
10478 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10479 * handle: Window (widget) handle. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10480 * 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
|
10481 * 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
|
10482 * width: Width of the widget. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10483 * height: Height of the widget. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10484 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10485 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
|
10486 { |
|
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
|
10487 dw_window_set_size(handle, width, height); |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10488 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
|
10489 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10490 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10491 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10492 * 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
|
10493 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10494 * handle: Window (widget) handle. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10495 * 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
|
10496 * 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
|
10497 * width: Width of the widget. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10498 * height: Height of the widget. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10499 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10500 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
|
10501 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10502 NSObject *object = handle; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
10503 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10504 if([ object isKindOfClass:[ NSWindow class ] ]) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10505 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10506 NSWindow *window = handle; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10507 NSRect rect = [window frame]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10508 if(x) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10509 *x = rect.origin.x; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10510 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
|
10511 *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
|
10512 if(width) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10513 *width = rect.size.width; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10514 if(height) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10515 *height = rect.size.height; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10516 return; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10517 } |
|
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
|
10518 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
|
10519 { |
|
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
|
10520 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
|
10521 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
|
10522 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
|
10523 *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
|
10524 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
|
10525 *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
|
10526 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
|
10527 *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
|
10528 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
|
10529 *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
|
10530 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
|
10531 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10532 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10533 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10534 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10535 * Returns the width of the screen. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10536 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10537 int API dw_screen_width(void) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10538 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10539 NSRect screenRect = [[NSScreen mainScreen] frame]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10540 return screenRect.size.width; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10541 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10542 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10543 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10544 * Returns the height of the screen. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10545 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10546 int API dw_screen_height(void) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10547 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10548 NSRect screenRect = [[NSScreen mainScreen] frame]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10549 return screenRect.size.height; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10550 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10551 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10552 /* 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
|
10553 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
|
10554 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10555 NSWindowDepth screenDepth = [[NSScreen mainScreen] depth]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10556 return NSBitsPerPixelFromDepth(screenDepth); |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10557 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10558 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10559 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10560 * 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
|
10561 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10562 * env: Pointer to a DWEnv struct. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10563 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10564 void dw_environment_query(DWEnv *env) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10565 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10566 struct utsname name; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
10567 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10568 uname(&name); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10569 strcpy(env->osName, "MacOS"); |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
10570 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10571 strcpy(env->buildDate, __DATE__); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10572 strcpy(env->buildTime, __TIME__); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10573 env->DWMajorVersion = DW_MAJOR_VERSION; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10574 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
|
10575 #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
|
10576 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
|
10577 #else |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10578 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
|
10579 #endif |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
10580 |
|
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
|
10581 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
|
10582 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
|
10583 env->MajorBuild = DWOSBuild; |
|
809
1ef0f4c03c14
MinorBuild was being left uninitialized.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
808
diff
changeset
|
10584 env->MinorBuild = 0; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10585 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10586 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10587 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10588 * Emits a beep. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10589 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10590 * freq: Frequency. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10591 * dur: Duration. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10592 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10593 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
|
10594 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10595 NSBeep(); |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10596 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10597 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10598 /* 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
|
10599 * anything you have drawn is visible. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10600 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10601 void API dw_flush(void) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10602 { |
|
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
|
10603 /* 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
|
10604 [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
|
10605 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10606 |
|
651
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
10607 /* 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
|
10608 * 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
|
10609 * dw_window_get_data(). |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
10610 */ |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
10611 UserData *_find_userdata(UserData **root, char *varname) |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
10612 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10613 UserData *tmp = *root; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
10614 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10615 while(tmp) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10616 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10617 if(strcasecmp(tmp->varname, varname) == 0) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10618 return tmp; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10619 tmp = tmp->next; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10620 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10621 return NULL; |
|
651
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
10622 } |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
10623 |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
10624 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
|
10625 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10626 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
|
10627 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10628 if(new) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10629 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10630 new->data = data; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10631 return TRUE; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10632 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10633 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10634 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10635 new = malloc(sizeof(UserData)); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10636 if(new) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10637 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10638 new->varname = strdup(varname); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10639 new->data = data; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
10640 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10641 new->next = NULL; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
10642 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10643 if (!*root) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10644 *root = new; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10645 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10646 { |
|
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
|
10647 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
|
10648 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10649 while(tmp) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10650 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10651 prev = tmp; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10652 tmp = tmp->next; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10653 } |
|
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
|
10654 prev->next = new; |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10655 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10656 return TRUE; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10657 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10658 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10659 return FALSE; |
|
651
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
10660 } |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
10661 |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
10662 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
|
10663 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10664 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
|
10665 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10666 while(tmp) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10667 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10668 if(all || strcasecmp(tmp->varname, varname) == 0) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10669 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10670 if(!prev) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10671 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10672 *root = tmp->next; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10673 free(tmp->varname); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10674 free(tmp); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10675 if(!all) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10676 return 0; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10677 tmp = *root; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10678 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10679 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10680 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10681 /* If all is true we should |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10682 * never get here. |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10683 */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10684 prev->next = tmp->next; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10685 free(tmp->varname); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10686 free(tmp); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10687 return 0; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10688 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10689 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10690 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10691 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10692 prev = tmp; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10693 tmp = tmp->next; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10694 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10695 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10696 return 0; |
|
651
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
10697 } |
|
270580896dac
Filling in more class types.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
650
diff
changeset
|
10698 |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10699 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10700 * 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
|
10701 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10702 * 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
|
10703 * 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
|
10704 * 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
|
10705 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10706 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
|
10707 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10708 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
|
10709 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
|
10710 { |
|
5fe12469c1fb
Fix for dw_window_set/get_data() on a top-level window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
680
diff
changeset
|
10711 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
|
10712 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
|
10713 } |
|
5fe12469c1fb
Fix for dw_window_set/get_data() on a top-level window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
680
diff
changeset
|
10714 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
|
10715 { |
|
9861d264925d
MLE was missing the scrollbar. Fixes for getting and setting the position.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
675
diff
changeset
|
10716 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
|
10717 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
|
10718 } |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10719 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
|
10720 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10721 if(!blah) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10722 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10723 if(!dataname) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10724 return; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
10725 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10726 blah = calloc(1, sizeof(WindowData)); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10727 [object setUserdata:blah]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10728 } |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
10729 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10730 if(data) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10731 _new_userdata(&(blah->root), dataname, data); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10732 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10733 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10734 if(dataname) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10735 _remove_userdata(&(blah->root), dataname, FALSE); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10736 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10737 _remove_userdata(&(blah->root), NULL, TRUE); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10738 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10739 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10740 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10741 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10742 * 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
|
10743 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10744 * 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
|
10745 * 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
|
10746 * 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
|
10747 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10748 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
|
10749 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10750 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
|
10751 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
|
10752 { |
|
5fe12469c1fb
Fix for dw_window_set/get_data() on a top-level window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
680
diff
changeset
|
10753 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
|
10754 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
|
10755 } |
|
5fe12469c1fb
Fix for dw_window_set/get_data() on a top-level window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
680
diff
changeset
|
10756 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
|
10757 { |
|
9861d264925d
MLE was missing the scrollbar. Fixes for getting and setting the position.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
675
diff
changeset
|
10758 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
|
10759 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
|
10760 } |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10761 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
|
10762 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10763 if(blah && blah->root && dataname) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10764 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10765 UserData *ud = _find_userdata(&(blah->root), dataname); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10766 if(ud) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10767 return ud->data; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10768 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10769 return NULL; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10770 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10771 |
|
657
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
10772 #define DW_TIMER_MAX 64 |
|
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
10773 NSTimer *DWTimers[DW_TIMER_MAX]; |
|
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
10774 |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10775 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10776 * 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
|
10777 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10778 * interval: Milliseconds to delay between calls. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10779 * 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
|
10780 * 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
|
10781 * Returns: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10782 * 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
|
10783 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10784 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
|
10785 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10786 int z; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
10787 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10788 for(z=0;z<DW_TIMER_MAX;z++) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10789 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10790 if(!DWTimers[z]) |
|
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 break; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10793 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10794 } |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
10795 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10796 if(sigfunc && !DWTimers[z]) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10797 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10798 NSTimeInterval seconds = (double)interval / 1000.0; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10799 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
|
10800 _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
|
10801 return z+1; |
|
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 return 0; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10804 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10805 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10806 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10807 * Removes timer callback. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10808 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10809 * 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
|
10810 */ |
|
657
f31a47b055f8
Work (unfinished) on container objects.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
656
diff
changeset
|
10811 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
|
10812 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10813 SignalHandler *prev = NULL, *tmp = Root; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10814 NSTimer *thistimer; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
10815 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10816 /* 0 is an invalid timer ID */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10817 if(timerid < 1 || !DWTimers[timerid-1]) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10818 return; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
10819 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10820 thistimer = DWTimers[timerid-1]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10821 DWTimers[timerid-1] = nil; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
10822 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10823 [thistimer invalidate]; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
10824 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10825 while(tmp) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10826 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10827 if(tmp->id == timerid && tmp->window == thistimer) |
|
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 if(prev) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10830 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10831 prev->next = tmp->next; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10832 free(tmp); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10833 tmp = prev->next; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10834 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10835 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10836 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10837 Root = tmp->next; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10838 free(tmp); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10839 tmp = Root; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10840 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10841 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10842 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10843 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10844 prev = tmp; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10845 tmp = tmp->next; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10846 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10847 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10848 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10849 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10850 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10851 * 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
|
10852 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10853 * 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
|
10854 * 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
|
10855 * 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
|
10856 * 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
|
10857 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10858 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
|
10859 { |
|
1853
4790589f52a9
Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1849
diff
changeset
|
10860 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
|
10861 } |
|
4790589f52a9
Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1849
diff
changeset
|
10862 |
|
4790589f52a9
Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1849
diff
changeset
|
10863 /* |
|
4790589f52a9
Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1849
diff
changeset
|
10864 * 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
|
10865 * Parameters: |
|
4790589f52a9
Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1849
diff
changeset
|
10866 * 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
|
10867 * 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
|
10868 * 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
|
10869 * 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
|
10870 * 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
|
10871 */ |
|
4790589f52a9
Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1849
diff
changeset
|
10872 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
|
10873 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10874 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
|
10875 |
|
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
|
10876 /* 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
|
10877 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
|
10878 { |
|
2fe7fca61236
Added support for trapping the Mac Quit handler by using DW_DESKTOP as
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1825
diff
changeset
|
10879 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
|
10880 } |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10881 |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10882 if(window && signame && sigfunc) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10883 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10884 if((message = _findsigmessage(signame)) != 0) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10885 { |
|
1853
4790589f52a9
Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1849
diff
changeset
|
10886 _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
|
10887 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10888 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10889 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10890 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10891 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10892 * 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
|
10893 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10894 * 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
|
10895 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10896 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
|
10897 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10898 SignalHandler *prev = NULL, *tmp = Root; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10899 ULONG message; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
10900 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10901 if(!window || !signame || (message = _findsigmessage(signame)) == 0) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10902 return; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
10903 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10904 while(tmp) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10905 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10906 if(tmp->window == window && tmp->message == message) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10907 { |
|
1853
4790589f52a9
Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1849
diff
changeset
|
10908 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
|
10909 |
|
1853
4790589f52a9
Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1849
diff
changeset
|
10910 if(discfunc) |
|
4790589f52a9
Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1849
diff
changeset
|
10911 { |
|
4790589f52a9
Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1849
diff
changeset
|
10912 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
|
10913 } |
|
1922
a2a8145f3148
Turn off smart text and quote substitution on MLE.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1914
diff
changeset
|
10914 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10915 if(prev) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10916 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10917 prev->next = tmp->next; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10918 free(tmp); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10919 tmp = prev->next; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10920 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10921 else |
|
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 Root = tmp->next; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10924 free(tmp); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10925 tmp = Root; |
|
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 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10928 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10929 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10930 prev = tmp; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10931 tmp = tmp->next; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10932 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10933 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10934 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10935 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10936 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10937 * 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
|
10938 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10939 * 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
|
10940 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10941 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
|
10942 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10943 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
|
10944 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10945 while(tmp) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10946 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10947 if(tmp->window == window) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10948 { |
|
1853
4790589f52a9
Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1849
diff
changeset
|
10949 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
|
10950 |
|
1853
4790589f52a9
Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1849
diff
changeset
|
10951 if(discfunc) |
|
4790589f52a9
Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1849
diff
changeset
|
10952 { |
|
4790589f52a9
Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1849
diff
changeset
|
10953 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
|
10954 } |
|
1922
a2a8145f3148
Turn off smart text and quote substitution on MLE.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1914
diff
changeset
|
10955 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10956 if(prev) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10957 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10958 prev->next = tmp->next; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10959 free(tmp); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10960 tmp = prev->next; |
|
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 else |
|
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 Root = 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 = Root; |
|
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 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10969 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10970 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10971 prev = tmp; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10972 tmp = tmp->next; |
|
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 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10975 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10976 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10977 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10978 * 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
|
10979 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10980 * 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
|
10981 * 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
|
10982 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
10983 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
|
10984 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10985 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
|
10986 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10987 while(tmp) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10988 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10989 if(tmp->window == window && tmp->data == data) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10990 { |
|
1853
4790589f52a9
Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1849
diff
changeset
|
10991 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
|
10992 |
|
1853
4790589f52a9
Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1849
diff
changeset
|
10993 if(discfunc) |
|
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 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
|
10996 } |
|
1922
a2a8145f3148
Turn off smart text and quote substitution on MLE.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1914
diff
changeset
|
10997 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10998 if(prev) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
10999 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11000 prev->next = tmp->next; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11001 free(tmp); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11002 tmp = prev->next; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11003 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11004 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11005 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11006 Root = tmp->next; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11007 free(tmp); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11008 tmp = Root; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11009 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11010 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11011 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11012 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11013 prev = tmp; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11014 tmp = tmp->next; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11015 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11016 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11017 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11018 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11019 void _my_strlwr(char *buf) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11020 { |
|
1110
404b639f096b
Minor typecast fixes for warnings reported by clang on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1102
diff
changeset
|
11021 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
|
11022 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11023 for(z=0;z<len;z++) |
|
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 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
|
11026 buf[z] -= 'A' - 'a'; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11027 } |
|
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 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11030 /* 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
|
11031 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11032 * 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
|
11033 * handle: Pointer to a module handle, |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11034 * 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
|
11035 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11036 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
|
11037 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11038 int len; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11039 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
|
11040 char errorbuf[1025]; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11041 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11042 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11043 if(!handle) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11044 return -1; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11045 |
|
1110
404b639f096b
Minor typecast fixes for warnings reported by clang on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1102
diff
changeset
|
11046 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
|
11047 return -1; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11048 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11049 /* Lenth + "lib" + ".dylib" + NULL */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11050 newname = malloc(len + 10); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11051 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11052 if(!newname) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11053 return -1; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11054 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11055 sprintf(newname, "lib%s.dylib", name); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11056 _my_strlwr(newname); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11057 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11058 *handle = dlopen(newname, RTLD_NOW); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11059 if(*handle == NULL) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11060 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11061 strncpy(errorbuf, dlerror(), 1024); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11062 printf("%s\n", errorbuf); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11063 sprintf(newname, "lib%s.dylib", name); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11064 *handle = dlopen(newname, RTLD_NOW); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11065 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11066 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11067 free(newname); |
|
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 return (NULL == *handle) ? -1 : 0; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11070 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11071 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11072 /* 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
|
11073 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11074 * 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
|
11075 * 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
|
11076 * 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
|
11077 * the address. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11078 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11079 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
|
11080 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11081 if(!func || !name) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11082 return -1; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11083 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11084 if(strlen(name) == 0) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11085 return -1; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11086 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11087 *func = (void*)dlsym(handle, name); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11088 return (NULL == *func); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11089 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11090 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11091 /* Frees the shared library previously opened. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11092 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11093 * 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
|
11094 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11095 int dw_module_close(HMOD handle) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11096 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11097 if(handle) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11098 return dlclose(handle); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11099 return 0; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11100 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11101 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11102 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11103 * 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
|
11104 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11105 HMTX dw_mutex_new(void) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11106 { |
|
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
|
11107 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
|
11108 |
|
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
|
11109 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
|
11110 return mutex; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11111 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11112 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11113 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11114 * 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
|
11115 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11116 * 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
|
11117 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11118 void dw_mutex_close(HMTX mutex) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11119 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11120 if(mutex) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11121 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11122 pthread_mutex_destroy(mutex); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11123 free(mutex); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11124 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11125 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11126 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11127 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11128 * 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
|
11129 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11130 * 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
|
11131 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11132 void dw_mutex_lock(HMTX mutex) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11133 { |
|
693
2f21ee9d7c7b
Experimental change for locking on the main thread... will be committing
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
692
diff
changeset
|
11134 /* 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
|
11135 * 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
|
11136 * 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
|
11137 * 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
|
11138 */ |
|
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
|
11139 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
|
11140 { |
|
693
2f21ee9d7c7b
Experimental change for locking on the main thread... will be committing
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
692
diff
changeset
|
11141 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
|
11142 { |
|
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
|
11143 /* 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
|
11144 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
|
11145 { |
|
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
|
11146 /* 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
|
11147 } |
|
693
2f21ee9d7c7b
Experimental change for locking on the main thread... will be committing
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
692
diff
changeset
|
11148 } |
|
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
|
11149 } |
|
693
2f21ee9d7c7b
Experimental change for locking on the main thread... will be committing
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
692
diff
changeset
|
11150 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
|
11151 { |
|
693
2f21ee9d7c7b
Experimental change for locking on the main thread... will be committing
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
692
diff
changeset
|
11152 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
|
11153 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11154 } |
|
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 /* |
|
1158
f86f556ff29d
Added dw_mutex_trylock() that functions like dw_mutex_lock() except
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1155
diff
changeset
|
11157 * 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
|
11158 * Parameters: |
|
f86f556ff29d
Added dw_mutex_trylock() that functions like dw_mutex_lock() except
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1155
diff
changeset
|
11159 * 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
|
11160 * Returns: |
|
f86f556ff29d
Added dw_mutex_trylock() that functions like dw_mutex_lock() except
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1155
diff
changeset
|
11161 * 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
|
11162 */ |
|
f86f556ff29d
Added dw_mutex_trylock() that functions like dw_mutex_lock() except
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1155
diff
changeset
|
11163 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
|
11164 { |
|
f86f556ff29d
Added dw_mutex_trylock() that functions like dw_mutex_lock() except
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1155
diff
changeset
|
11165 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
|
11166 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
|
11167 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
|
11168 } |
|
f86f556ff29d
Added dw_mutex_trylock() that functions like dw_mutex_lock() except
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1155
diff
changeset
|
11169 |
|
f86f556ff29d
Added dw_mutex_trylock() that functions like dw_mutex_lock() except
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1155
diff
changeset
|
11170 /* |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11171 * Reliquishes the access to the semaphore. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11172 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11173 * 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
|
11174 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11175 void dw_mutex_unlock(HMTX mutex) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11176 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11177 pthread_mutex_unlock(mutex); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11178 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11179 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11180 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11181 * 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
|
11182 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11183 HEV dw_event_new(void) |
|
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 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
|
11186 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11187 if(!eve) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11188 return NULL; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11189 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11190 /* 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
|
11191 * 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
|
11192 * 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
|
11193 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11194 pthread_mutex_init (&(eve->mutex), NULL); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11195 pthread_mutex_lock (&(eve->mutex)); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11196 pthread_cond_init (&(eve->event), NULL); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11197 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11198 pthread_mutex_unlock (&(eve->mutex)); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11199 eve->alive = 1; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11200 eve->posted = 0; |
|
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 eve; |
|
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 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11206 * 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
|
11207 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11208 * 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
|
11209 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11210 int dw_event_reset (HEV eve) |
|
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 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
|
11213 return DW_ERROR_NON_INIT; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11214 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11215 pthread_mutex_lock (&(eve->mutex)); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11216 pthread_cond_broadcast (&(eve->event)); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11217 pthread_cond_init (&(eve->event), NULL); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11218 eve->posted = 0; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11219 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
|
11220 return DW_ERROR_NONE; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11221 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11222 |
|
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 * 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
|
11225 * 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
|
11226 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11227 * 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
|
11228 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11229 int dw_event_post (HEV eve) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11230 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11231 if(!eve) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11232 return FALSE; |
|
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 pthread_mutex_lock (&(eve->mutex)); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11235 pthread_cond_broadcast (&(eve->event)); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11236 eve->posted = 1; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11237 pthread_mutex_unlock (&(eve->mutex)); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11238 return 0; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11239 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11240 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11241 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11242 * 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
|
11243 * 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
|
11244 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11245 * 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
|
11246 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11247 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
|
11248 { |
|
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
|
11249 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
|
11250 |
|
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
|
11251 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
|
11252 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
|
11253 |
|
1202
5c1a01c6384d
Think we need to check the posted state inside the mutex...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1201
diff
changeset
|
11254 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
|
11255 |
|
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
|
11256 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
|
11257 { |
|
5c1a01c6384d
Think we need to check the posted state inside the mutex...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1201
diff
changeset
|
11258 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
|
11259 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
|
11260 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
11261 |
|
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
|
11262 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
|
11263 { |
|
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
|
11264 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
|
11265 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
|
11266 |
|
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
|
11267 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
|
11268 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
|
11269 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
|
11270 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
|
11271 } |
|
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
|
11272 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
|
11273 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
|
11274 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
|
11275 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
|
11276 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
|
11277 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
|
11278 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
|
11279 return DW_ERROR_GENERAL; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11280 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11281 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11282 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11283 * 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
|
11284 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11285 * 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
|
11286 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11287 int dw_event_close(HEV *eve) |
|
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 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
|
11290 return DW_ERROR_NON_INIT; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11291 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11292 pthread_mutex_lock (&((*eve)->mutex)); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11293 pthread_cond_destroy (&((*eve)->event)); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11294 pthread_mutex_unlock (&((*eve)->mutex)); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11295 pthread_mutex_destroy (&((*eve)->mutex)); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11296 free(*eve); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11297 *eve = NULL; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11298 |
|
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
|
11299 return DW_ERROR_NONE; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11300 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11301 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11302 struct _seminfo { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11303 int fd; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11304 int waiting; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11305 }; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11306 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11307 static void _handle_sem(int *tmpsock) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11308 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11309 fd_set rd; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11310 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
|
11311 int listenfd = tmpsock[0]; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11312 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
|
11313 char command; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11314 sigset_t mask; |
|
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 sigfillset(&mask); /* Mask all allowed signals */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11317 pthread_sigmask(SIG_BLOCK, &mask, NULL); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11318 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11319 /* problems */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11320 if(tmpsock[1] == -1) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11321 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11322 free(array); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11323 return; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11324 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11325 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11326 array[0].fd = tmpsock[1]; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11327 array[0].waiting = 0; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11328 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11329 /* 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
|
11330 free(tmpsock); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11331 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11332 while(1) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11333 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11334 FD_ZERO(&rd); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11335 FD_SET(listenfd, &rd); |
|
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 maxfd = listenfd; |
|
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 /* 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
|
11340 for(z=0;z<connectcount;z++) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11341 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11342 if(array[z].fd > maxfd) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11343 maxfd = array[z].fd; |
|
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 FD_SET(array[z].fd, &rd); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11346 } |
|
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 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
|
11349 { |
|
f7d408a47752
Fix a couple of errors reported by the static analyzer on Mac....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1885
diff
changeset
|
11350 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
|
11351 return; |
|
f7d408a47752
Fix a couple of errors reported by the static analyzer on Mac....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1885
diff
changeset
|
11352 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11353 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11354 if(FD_ISSET(listenfd, &rd)) |
|
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 struct _seminfo *newarray; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11357 int newfd = accept(listenfd, 0, 0); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11358 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11359 if(newfd > -1) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11360 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11361 /* Add new connections to the set */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11362 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
|
11363 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
|
11364 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11365 newarray[connectcount].fd = newfd; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11366 newarray[connectcount].waiting = 0; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11367 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11368 connectcount++; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11369 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11370 /* Replace old array with new one */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11371 free(array); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11372 array = newarray; |
|
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 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11376 /* 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
|
11377 for(z=0;z<connectcount;z++) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11378 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11379 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
|
11380 { |
|
1110
404b639f096b
Minor typecast fixes for warnings reported by clang on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1102
diff
changeset
|
11381 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
|
11382 { |
|
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
|
11383 struct _seminfo *newarray = NULL; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11384 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11385 /* 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
|
11386 if(connectcount > 1) |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11387 { |
|
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
|
11388 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
|
11389 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
|
11390 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
|
11391 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
|
11392 { |
|
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
|
11393 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
|
11394 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
|
11395 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
|
11396 } |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11397 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11398 connectcount--; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11399 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11400 /* Replace old array with new one */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11401 free(array); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11402 array = newarray; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11403 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11404 else if(bytesread == 1) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11405 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11406 switch(command) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11407 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11408 case 0: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11409 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11410 /* Reset */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11411 posted = 0; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11412 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11413 break; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11414 case 1: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11415 /* Post */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11416 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11417 int s; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11418 char tmp = (char)0; |
|
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 posted = 1; |
|
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 for(s=0;s<connectcount;s++) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11423 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11424 /* The semaphore has been posted so |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11425 * 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
|
11426 * continue. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11427 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11428 if(array[s].waiting) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11429 write(array[s].fd, &tmp, 1); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11430 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11431 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11432 break; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11433 case 2: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11434 /* Wait */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11435 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11436 char tmp = (char)0; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11437 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11438 array[z].waiting = 1; |
|
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 /* If we are posted exit immeditately */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11441 if(posted) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11442 write(array[z].fd, &tmp, 1); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11443 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11444 break; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11445 case 3: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11446 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11447 /* Done Waiting */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11448 array[z].waiting = 0; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11449 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11450 break; |
|
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 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11453 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11454 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11455 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11456 } |
|
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 /* 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
|
11459 /* 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
|
11460 * opened from other processes. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11461 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11462 * 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
|
11463 * 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
|
11464 * by other processes. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11465 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11466 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
|
11467 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11468 struct sockaddr_un un; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11469 int ev, *tmpsock = (int *)malloc(sizeof(int)*2); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11470 HEV eve; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11471 DWTID dwthread; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11472 |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11473 if(!tmpsock) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11474 return NULL; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11475 |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11476 eve = (HEV)malloc(sizeof(struct _dw_unix_event)); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11477 |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11478 if(!eve) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11479 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11480 free(tmpsock); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11481 return NULL; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11482 } |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
11483 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11484 tmpsock[0] = socket(AF_UNIX, SOCK_STREAM, 0); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11485 ev = socket(AF_UNIX, SOCK_STREAM, 0); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11486 memset(&un, 0, sizeof(un)); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11487 un.sun_family=AF_UNIX; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11488 mkdir("/tmp/.dw", S_IWGRP|S_IWOTH); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11489 strcpy(un.sun_path, "/tmp/.dw/"); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11490 strcat(un.sun_path, name); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11491 |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11492 /* just to be safe, this should be changed |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11493 * to support multiple instances. |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11494 */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11495 remove(un.sun_path); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11496 |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11497 bind(tmpsock[0], (struct sockaddr *)&un, sizeof(un)); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11498 listen(tmpsock[0], 0); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11499 connect(ev, (struct sockaddr *)&un, sizeof(un)); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11500 tmpsock[1] = accept(tmpsock[0], 0, 0); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11501 |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11502 if(tmpsock[0] < 0 || tmpsock[1] < 0 || ev < 0) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11503 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11504 if(tmpsock[0] > -1) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11505 close(tmpsock[0]); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11506 if(tmpsock[1] > -1) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11507 close(tmpsock[1]); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11508 if(ev > -1) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11509 close(ev); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11510 free(tmpsock); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11511 free(eve); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11512 return NULL; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11513 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11514 |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11515 /* Create a thread to handle this event semaphore */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11516 pthread_create(&dwthread, NULL, (void *)_handle_sem, (void *)tmpsock); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11517 eve->alive = ev; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11518 return eve; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11519 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11520 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11521 /* 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
|
11522 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11523 * 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
|
11524 * 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
|
11525 * by other processes. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11526 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11527 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
|
11528 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11529 struct sockaddr_un un; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11530 HEV eve; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11531 int ev = socket(AF_UNIX, SOCK_STREAM, 0); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11532 if(ev < 0) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11533 return NULL; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11534 |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11535 eve = (HEV)malloc(sizeof(struct _dw_unix_event)); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11536 |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11537 if(!eve) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11538 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11539 close(ev); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11540 return NULL; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11541 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11542 |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11543 un.sun_family=AF_UNIX; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11544 mkdir("/tmp/.dw", S_IWGRP|S_IWOTH); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11545 strcpy(un.sun_path, "/tmp/.dw/"); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11546 strcat(un.sun_path, name); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11547 connect(ev, (struct sockaddr *)&un, sizeof(un)); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11548 eve->alive = ev; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11549 return eve; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11550 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11551 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11552 /* 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
|
11553 * on this semaphore will block. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11554 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11555 * 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
|
11556 * an open or create call. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11557 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11558 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
|
11559 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11560 /* signal reset */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11561 char tmp = (char)0; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11562 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11563 if(!eve || eve->alive < 0) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11564 return 0; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11565 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11566 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
|
11567 return 0; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11568 return 1; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11569 } |
|
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 /* 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
|
11572 * 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
|
11573 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11574 * 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
|
11575 * an open or create call. |
|
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 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
|
11578 { |
|
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 /* signal post */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11581 char tmp = (char)1; |
|
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 if(!eve || eve->alive < 0) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11584 return 0; |
|
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 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
|
11587 return 0; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11588 return 1; |
|
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 /* 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
|
11592 * 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
|
11593 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11594 * 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
|
11595 * an open or create call. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11596 * 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
|
11597 * or -1 if indefinite. |
|
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 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
|
11600 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11601 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
|
11602 struct timeval tv, *useme = NULL; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11603 int retval = 0; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11604 char tmp; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11605 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11606 if(!eve || eve->alive < 0) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11607 return DW_ERROR_NON_INIT; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11608 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11609 /* 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
|
11610 if(timeout != -1) |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11611 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11612 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
|
11613 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
|
11614 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11615 useme = &tv; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11616 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11617 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11618 FD_ZERO(&rd); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11619 FD_SET(eve->alive, &rd); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11620 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11621 /* Signal wait */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11622 tmp = (char)2; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11623 write(eve->alive, &tmp, 1); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11624 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11625 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
|
11626 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11627 /* Signal done waiting. */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11628 tmp = (char)3; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11629 write(eve->alive, &tmp, 1); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11630 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11631 if(retval == 0) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11632 return DW_ERROR_TIMEOUT; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11633 else if(retval == -1) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11634 return DW_ERROR_INTERRUPT; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11635 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11636 /* 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
|
11637 * we don't loop endlessly. :) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11638 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11639 read(eve->alive, &tmp, 1); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11640 return 0; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11641 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11642 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11643 /* 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
|
11644 * 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
|
11645 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11646 * 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
|
11647 * an open or create call. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11648 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11649 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
|
11650 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11651 /* Finally close the domain socket, |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11652 * cleanup will continue in _handle_sem. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11653 */ |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11654 if(eve) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11655 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11656 close(eve->alive); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11657 free(eve); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11658 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11659 return 0; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11660 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11661 |
|
697
830e1f3672b9
Added draining mechanism for threads that don't have run loops.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
696
diff
changeset
|
11662 /* 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
|
11663 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
|
11664 { |
|
830e1f3672b9
Added draining mechanism for threads that don't have run loops.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
696
diff
changeset
|
11665 #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
|
11666 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
|
11667 [pool drain]; |
|
698
e19f69a78f21
Fix for pool being removed and not just drained.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
697
diff
changeset
|
11668 pool = [[NSAutoreleasePool alloc] init]; |
|
e19f69a78f21
Fix for pool being removed and not just drained.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
697
diff
changeset
|
11669 pthread_setspecific(_dw_pool_key, pool); |
|
731
6a589a1a42b0
Add dw_window_get_font()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
730
diff
changeset
|
11670 #endif |
|
697
830e1f3672b9
Added draining mechanism for threads that don't have run loops.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
696
diff
changeset
|
11671 } |
|
830e1f3672b9
Added draining mechanism for threads that don't have run loops.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
696
diff
changeset
|
11672 |
|
1922
a2a8145f3148
Turn off smart text and quote substitution on MLE.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1914
diff
changeset
|
11673 /* |
|
1887
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11674 * 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
|
11675 * 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
|
11676 * 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
|
11677 * 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
|
11678 */ |
|
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11679 void API _dw_init_thread(void) |
|
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11680 { |
|
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
|
11681 /* 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
|
11682 #if !defined(GARBAGE_COLLECT) |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11683 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
|
11684 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
|
11685 #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
|
11686 _init_colors(); |
|
1887
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11687 } |
|
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11688 |
|
1922
a2a8145f3148
Turn off smart text and quote substitution on MLE.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1914
diff
changeset
|
11689 /* |
|
1887
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11690 * 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
|
11691 * 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
|
11692 * 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
|
11693 * 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
|
11694 */ |
|
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11695 void API _dw_deinit_thread(void) |
|
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11696 { |
|
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11697 NSColor *color; |
|
1922
a2a8145f3148
Turn off smart text and quote substitution on MLE.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1914
diff
changeset
|
11698 |
|
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
|
11699 /* 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
|
11700 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
|
11701 [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
|
11702 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
|
11703 [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
|
11704 #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
|
11705 pool = pthread_getspecific(_dw_pool_key); |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11706 [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
|
11707 #endif |
|
1887
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11708 } |
|
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11709 |
|
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11710 /* |
|
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11711 * Setup thread independent pools. |
|
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11712 */ |
|
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11713 void _dwthreadstart(void *data) |
|
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11714 { |
|
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11715 void (*threadfunc)(void *) = NULL; |
|
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11716 void **tmp = (void **)data; |
|
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11717 |
|
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11718 _dw_init_thread(); |
|
1922
a2a8145f3148
Turn off smart text and quote substitution on MLE.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1914
diff
changeset
|
11719 |
|
1887
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11720 threadfunc = (void (*)(void *))tmp[0]; |
|
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11721 |
|
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11722 /* Start our thread function */ |
|
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11723 threadfunc(tmp[1]); |
|
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11724 |
|
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
|
11725 free(tmp); |
|
1922
a2a8145f3148
Turn off smart text and quote substitution on MLE.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1914
diff
changeset
|
11726 |
|
1887
09860ba329a4
Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1886
diff
changeset
|
11727 _dw_deinit_thread(); |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11728 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11729 |
|
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
|
11730 /* |
|
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
|
11731 * 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
|
11732 * 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
|
11733 * 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
|
11734 */ |
|
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
|
11735 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
|
11736 { |
|
1241
459426f31fb4
Slight thread safety fix on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1239
diff
changeset
|
11737 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
|
11738 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
|
11739 [DWDefaultFont retain]; |
|
1241
459426f31fb4
Slight thread safety fix on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1239
diff
changeset
|
11740 [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
|
11741 } |
|
9882b0dfa304
Added an internal Mac function for setting the default Dynamic Windows font.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
743
diff
changeset
|
11742 |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11743 /* |
|
697
830e1f3672b9
Added draining mechanism for threads that don't have run loops.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
696
diff
changeset
|
11744 * 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
|
11745 * Parameters: |
|
830e1f3672b9
Added draining mechanism for threads that don't have run loops.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
696
diff
changeset
|
11746 * 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
|
11747 * 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
|
11748 */ |
|
830e1f3672b9
Added draining mechanism for threads that don't have run loops.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
696
diff
changeset
|
11749 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
|
11750 { |
|
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
|
11751 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
|
11752 |
|
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
|
11753 /* 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
|
11754 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
|
11755 { |
|
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
|
11756 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
|
11757 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
|
11758 |
|
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
|
11759 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
|
11760 { |
|
1381
3ba4853d5b78
Initial attempt at dw_app_dir() for OS/2, Windows and Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1378
diff
changeset
|
11761 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
|
11762 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
|
11763 |
|
1381
3ba4853d5b78
Initial attempt at dw_app_dir() for OS/2, Windows and Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1378
diff
changeset
|
11764 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
|
11765 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
|
11766 *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
|
11767 |
|
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
|
11768 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
|
11769 |
|
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
|
11770 /* 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
|
11771 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
|
11772 { |
|
1381
3ba4853d5b78
Initial attempt at dw_app_dir() for OS/2, Windows and Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1378
diff
changeset
|
11773 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
|
11774 |
|
3ba4853d5b78
Initial attempt at dw_app_dir() for OS/2, Windows and Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1378
diff
changeset
|
11775 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
|
11776 { |
|
1381
3ba4853d5b78
Initial attempt at dw_app_dir() for OS/2, Windows and Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1378
diff
changeset
|
11777 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
|
11778 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
|
11779 } |
|
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
|
11780 } |
|
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
|
11781 } |
|
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
|
11782 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
|
11783 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
|
11784 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
11785 |
|
1381
3ba4853d5b78
Initial attempt at dw_app_dir() for OS/2, Windows and Mac...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1378
diff
changeset
|
11786 /* 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
|
11787 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
|
11788 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
|
11789 |
|
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
|
11790 /* 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
|
11791 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
|
11792 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
|
11793 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
|
11794 /* 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
|
11795 * 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
|
11796 */ |
|
9a32d4216f24
Make sure we set the locale on Mac and it is UTF-8.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1784
diff
changeset
|
11797 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
|
11798 /* 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
|
11799 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
|
11800 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
|
11801 [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
|
11802 /* 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
|
11803 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
|
11804 /* 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
|
11805 #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
|
11806 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
|
11807 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
|
11808 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
|
11809 #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
|
11810 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
|
11811 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
|
11812 _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
|
11813 /* 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
|
11814 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
|
11815 [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
|
11816 [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
|
11817 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
|
11818 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
|
11819 #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
|
11820 _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
|
11821 #else |
|
697
830e1f3672b9
Added draining mechanism for threads that don't have run loops.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
696
diff
changeset
|
11822 /* 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
|
11823 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
|
11824 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
|
11825 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
|
11826 #endif |
|
697
830e1f3672b9
Added draining mechanism for threads that don't have run loops.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
696
diff
changeset
|
11827 /* 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
|
11828 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
|
11829 [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
|
11830 [thread release]; |
|
859
80a88c91ccf6
Implemented vertical centering on text fields.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
858
diff
changeset
|
11831 [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
|
11832 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
|
11833 } |
|
830e1f3672b9
Added draining mechanism for threads that don't have run loops.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
696
diff
changeset
|
11834 |
|
830e1f3672b9
Added draining mechanism for threads that don't have run loops.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
696
diff
changeset
|
11835 /* |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11836 * 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
|
11837 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11838 * 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
|
11839 * 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
|
11840 * 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
|
11841 * 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
|
11842 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11843 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
|
11844 { |
|
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
|
11845 char namebuf[1025] = {0}; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11846 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
|
11847 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11848 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
|
11849 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
|
11850 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11851 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
|
11852 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11853 free(handle); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11854 return NULL; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11855 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11856 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11857 ftruncate(handle->fd, size); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11858 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11859 /* 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
|
11860 *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
|
11861 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11862 if(*dest == MAP_FAILED) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11863 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11864 close(handle->fd); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11865 *dest = NULL; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11866 free(handle); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11867 return NULL; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11868 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11869 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11870 handle->size = size; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11871 handle->sid = getsid(0); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11872 handle->path = strdup(namebuf); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11873 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11874 return handle; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11875 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11876 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11877 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11878 * 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
|
11879 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11880 * 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
|
11881 * 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
|
11882 * 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
|
11883 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11884 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
|
11885 { |
|
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
|
11886 char namebuf[1025]; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11887 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
|
11888 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11889 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
|
11890 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
|
11891 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11892 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
|
11893 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11894 free(handle); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11895 return NULL; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11896 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11897 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11898 /* 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
|
11899 *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
|
11900 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11901 if(*dest == MAP_FAILED) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11902 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11903 close(handle->fd); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11904 *dest = NULL; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11905 free(handle); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11906 return NULL; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11907 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11908 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11909 handle->size = size; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11910 handle->sid = -1; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11911 handle->path = NULL; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11912 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11913 return handle; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11914 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11915 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11916 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11917 * 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
|
11918 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11919 * 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
|
11920 * 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
|
11921 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11922 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
|
11923 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11924 struct _dw_unix_shm *h = handle; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11925 int rc = munmap(ptr, h->size); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11926 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11927 close(h->fd); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11928 if(h->path) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11929 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11930 /* 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
|
11931 * creator of the file. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11932 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11933 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
|
11934 remove(h->path); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11935 free(h->path); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11936 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11937 return rc; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11938 } |
|
697
830e1f3672b9
Added draining mechanism for threads that don't have run loops.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
696
diff
changeset
|
11939 |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11940 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11941 * 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
|
11942 * Parameters: |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11943 * 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
|
11944 * 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
|
11945 * 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
|
11946 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11947 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
|
11948 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11949 DWTID thread; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11950 void **tmp = malloc(sizeof(void *) * 2); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11951 int rc; |
|
650
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11952 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11953 tmp[0] = func; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11954 tmp[1] = data; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11955 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11956 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
|
11957 if(rc == 0) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11958 return thread; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11959 return (DWTID)-1; |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11960 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11961 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11962 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11963 * Ends execution of current thread immediately. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11964 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11965 void dw_thread_end(void) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11966 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11967 pthread_exit(NULL); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11968 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11969 |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11970 /* |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11971 * Returns the current thread's ID. |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11972 */ |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11973 DWTID dw_thread_id(void) |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11974 { |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11975 return (DWTID)pthread_self(); |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11976 } |
|
55b677d460e9
Added initial support for a MacOS Cocoa port.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
11977 |
|
661
eee90a788876
Added missing functions needed to build HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
660
diff
changeset
|
11978 /* |
|
eee90a788876
Added missing functions needed to build HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
660
diff
changeset
|
11979 * 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
|
11980 * Parameters: |
|
eee90a788876
Added missing functions needed to build HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
660
diff
changeset
|
11981 * program: Program name with optional path. |
|
eee90a788876
Added missing functions needed to build HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
660
diff
changeset
|
11982 * 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
|
11983 * 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
|
11984 * Returns: |
|
eee90a788876
Added missing functions needed to build HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
660
diff
changeset
|
11985 * -1 on error. |
|
eee90a788876
Added missing functions needed to build HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
660
diff
changeset
|
11986 */ |
|
eee90a788876
Added missing functions needed to build HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
660
diff
changeset
|
11987 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
|
11988 { |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
11989 int ret = -1; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
11990 |
|
738
52d5ed00f892
Use NSWorkplace to launch GUI applications instead of fork() and exec().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
737
diff
changeset
|
11991 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
|
11992 { |
|
52d5ed00f892
Use NSWorkplace to launch GUI applications instead of fork() and exec().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
737
diff
changeset
|
11993 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
|
11994 { |
|
52d5ed00f892
Use NSWorkplace to launch GUI applications instead of fork() and exec().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
737
diff
changeset
|
11995 [[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
|
11996 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
|
11997 } |
|
52d5ed00f892
Use NSWorkplace to launch GUI applications instead of fork() and exec().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
737
diff
changeset
|
11998 else |
|
52d5ed00f892
Use NSWorkplace to launch GUI applications instead of fork() and exec().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
737
diff
changeset
|
11999 { |
|
52d5ed00f892
Use NSWorkplace to launch GUI applications instead of fork() and exec().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
737
diff
changeset
|
12000 [[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
|
12001 } |
|
52d5ed00f892
Use NSWorkplace to launch GUI applications instead of fork() and exec().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
737
diff
changeset
|
12002 return 0; |
|
52d5ed00f892
Use NSWorkplace to launch GUI applications instead of fork() and exec().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
737
diff
changeset
|
12003 } |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
12004 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12005 if((ret = fork()) == 0) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12006 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12007 int i; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
12008 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12009 for (i = 3; i < 256; i++) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12010 close(i); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12011 setsid(); |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
12012 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12013 if(type == DW_EXEC_CON) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12014 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12015 char **tmpargs; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
12016 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12017 if(!params) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12018 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12019 tmpargs = malloc(sizeof(char *)); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12020 tmpargs[0] = NULL; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12021 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12022 else |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12023 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12024 int z = 0; |
|
762
2aaa3f67cfb1
Fix for crashes with generating images from data
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
760
diff
changeset
|
12025 |
|
752
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12026 while(params[z]) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12027 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12028 z++; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12029 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12030 tmpargs = malloc(sizeof(char *)*(z+3)); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12031 z=0; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12032 tmpargs[0] = "xterm"; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12033 tmpargs[1] = "-e"; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12034 while(params[z]) |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12035 { |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12036 tmpargs[z+2] = params[z]; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12037 z++; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12038 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12039 tmpargs[z+2] = NULL; |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12040 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12041 execvp("xterm", tmpargs); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12042 free(tmpargs); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12043 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12044 /* If we got here exec failed */ |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12045 _exit(-1); |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12046 } |
|
cf447811d322
Converted tabs to spaces.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
751
diff
changeset
|
12047 return ret; |
|
661
eee90a788876
Added missing functions needed to build HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
660
diff
changeset
|
12048 } |
|
eee90a788876
Added missing functions needed to build HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
660
diff
changeset
|
12049 |
|
eee90a788876
Added missing functions needed to build HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
660
diff
changeset
|
12050 /* |
|
eee90a788876
Added missing functions needed to build HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
660
diff
changeset
|
12051 * 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
|
12052 * Parameters: |
|
eee90a788876
Added missing functions needed to build HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
660
diff
changeset
|
12053 * url: Uniform resource locator. |
|
eee90a788876
Added missing functions needed to build HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
660
diff
changeset
|
12054 */ |
|
eee90a788876
Added missing functions needed to build HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
660
diff
changeset
|
12055 int dw_browse(char *url) |
|
eee90a788876
Added missing functions needed to build HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
660
diff
changeset
|
12056 { |
|
715
5f8102bd7646
dw_browse() reimplmented so it actually works as expected.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
714
diff
changeset
|
12057 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
|
12058 [[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
|
12059 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
|
12060 } |
|
1137
e24e5a13ff2c
Added code to test the new print functions in dwtest.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1135
diff
changeset
|
12061 |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
12062 typedef struct _dwprint |
|
1141
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12063 { |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12064 NSPrintInfo *pi; |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12065 int (*drawfunc)(HPRINT, HPIXMAP, int, void *); |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12066 void *drawdata; |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12067 unsigned long flags; |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12068 } DWPrint; |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12069 |
|
1137
e24e5a13ff2c
Added code to test the new print functions in dwtest.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1135
diff
changeset
|
12070 /* |
|
e24e5a13ff2c
Added code to test the new print functions in dwtest.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1135
diff
changeset
|
12071 * 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
|
12072 * Parameters: |
|
1152
58b5374355ab
Added print jobname parameter to dw_print_new().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1147
diff
changeset
|
12073 * 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
|
12074 * 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
|
12075 * 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
|
12076 * 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
|
12077 * 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
|
12078 * Returns: |
|
e24e5a13ff2c
Added code to test the new print functions in dwtest.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1135
diff
changeset
|
12079 * 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
|
12080 */ |
|
1152
58b5374355ab
Added print jobname parameter to dw_print_new().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1147
diff
changeset
|
12081 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
|
12082 { |
|
1141
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12083 DWPrint *print; |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12084 NSPrintPanel *panel; |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12085 PMPrintSettings settings; |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12086 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
|
12087 |
|
1141
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12088 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
|
12089 { |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12090 return NULL; |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12091 } |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
12092 |
|
1152
58b5374355ab
Added print jobname parameter to dw_print_new().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1147
diff
changeset
|
12093 if(!jobname) |
|
58b5374355ab
Added print jobname parameter to dw_print_new().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1147
diff
changeset
|
12094 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
|
12095 |
|
1141
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12096 print->drawfunc = drawfunc; |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12097 print->drawdata = drawdata; |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12098 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
|
12099 |
|
1141
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12100 /* Get the page range */ |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12101 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
|
12102 [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
|
12103 [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
|
12104 [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
|
12105 [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
|
12106 [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
|
12107 [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
|
12108 [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
|
12109 [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
|
12110 [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
|
12111 |
|
1141
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12112 settings = [pi PMPrintSettings]; |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12113 PMSetPageRange(settings, 1, pages); |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12114 PMSetFirstPage(settings, 1, true); |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12115 PMSetLastPage(settings, pages, true); |
|
1152
58b5374355ab
Added print jobname parameter to dw_print_new().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1147
diff
changeset
|
12116 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
|
12117 [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
|
12118 |
|
1141
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12119 /* Create and show the print panel */ |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12120 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
|
12121 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
|
12122 { |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12123 free(print); |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12124 return NULL; |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12125 } |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12126 /* 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
|
12127 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
|
12128 |
|
1141
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12129 return print; |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12130 } |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12131 |
|
1802
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
12132 /* |
|
1137
e24e5a13ff2c
Added code to test the new print functions in dwtest.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1135
diff
changeset
|
12133 * 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
|
12134 * Parameters: |
|
e24e5a13ff2c
Added code to test the new print functions in dwtest.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1135
diff
changeset
|
12135 * 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
|
12136 * 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
|
12137 * Returns: |
|
e24e5a13ff2c
Added code to test the new print functions in dwtest.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1135
diff
changeset
|
12138 * 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
|
12139 */ |
|
e24e5a13ff2c
Added code to test the new print functions in dwtest.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1135
diff
changeset
|
12140 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
|
12141 { |
|
1141
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12142 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
|
12143 NSBitmapImageRep *rep, *rep2; |
|
1141
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12144 NSPrintInfo *pi; |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12145 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
|
12146 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
|
12147 NSImage *image, *flipped; |
|
1141
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12148 NSImageView *iv; |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12149 NSSize size; |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12150 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
|
12151 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
|
12152 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
|
12153 |
|
1141
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12154 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
|
12155 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
|
12156 |
|
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
|
12157 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
|
12158 |
|
1141
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12159 /* Figure out the printer/paper size */ |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12160 pi = p->pi; |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12161 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
|
12162 |
|
bee6fc8119ec
Paper size reported on Mac height is for all pages...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1230
diff
changeset
|
12163 /* 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
|
12164 settings = [pi PMPrintSettings]; |
|
bee6fc8119ec
Paper size reported on Mac height is for all pages...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1230
diff
changeset
|
12165 PMGetFirstPage(settings, &start); |
|
bee6fc8119ec
Paper size reported on Mac height is for all pages...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1230
diff
changeset
|
12166 if(start > 0) |
|
bee6fc8119ec
Paper size reported on Mac height is for all pages...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1230
diff
changeset
|
12167 start--; |
|
bee6fc8119ec
Paper size reported on Mac height is for all pages...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1230
diff
changeset
|
12168 PMGetLastPage(settings, &end); |
|
bee6fc8119ec
Paper size reported on Mac height is for all pages...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1230
diff
changeset
|
12169 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
|
12170 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
|
12171 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
|
12172 [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
|
12173 |
|
1141
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12174 /* 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
|
12175 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
|
12176 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
|
12177 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
|
12178 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
|
12179 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
|
12180 |
|
aedf5903db0a
Add DW_FCF_TEXTURED window style; relevant only for Mac port.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1795
diff
changeset
|
12181 /* 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
|
12182 * to go into the image view. |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12183 */ |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12184 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
|
12185 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
|
12186 [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
|
12187 [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
|
12188 [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
|
12189 [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
|
12190 [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
|
12191 [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
|
12192 |
|
1141
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12193 /* 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
|
12194 * 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
|
12195 */ |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12196 po = [NSPrintOperation printOperationWithView:iv printInfo:pi]; |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12197 [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
|
12198 |
|
1141
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12199 /* Cycle through each page */ |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12200 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
|
12201 { |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12202 /* Call the application's draw function */ |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12203 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
|
12204 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
|
12205 { |
|
890890c31ba6
Another printing cancel fix for the Mac and updated the readme.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1335
diff
changeset
|
12206 /* 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
|
12207 _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
|
12208 #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
|
12209 /* 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
|
12210 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
|
12211 [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
|
12212 #endif |
|
890890c31ba6
Another printing cancel fix for the Mac and updated the readme.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1335
diff
changeset
|
12213 /* 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
|
12214 [po runOperation]; |
|
890890c31ba6
Another printing cancel fix for the Mac and updated the readme.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1335
diff
changeset
|
12215 /* 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
|
12216 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
|
12217 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
|
12218 } |
|
1141
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12219 } |
|
1143
b1b23de965d7
Fixed using a pointer after being free()ed on Windows and Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1141
diff
changeset
|
12220 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
|
12221 result = DW_ERROR_NONE; |
|
1141
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12222 /* 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
|
12223 [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
|
12224 [flipped release]; |
|
1141
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12225 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
|
12226 dw_pixmap_destroy(pixmap2); |
|
1141
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12227 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
|
12228 [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
|
12229 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
|
12230 return result; |
|
1137
e24e5a13ff2c
Added code to test the new print functions in dwtest.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1135
diff
changeset
|
12231 } |
|
e24e5a13ff2c
Added code to test the new print functions in dwtest.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1135
diff
changeset
|
12232 |
|
e24e5a13ff2c
Added code to test the new print functions in dwtest.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1135
diff
changeset
|
12233 /* |
|
e24e5a13ff2c
Added code to test the new print functions in dwtest.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1135
diff
changeset
|
12234 * 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
|
12235 * Parameters: |
|
e24e5a13ff2c
Added code to test the new print functions in dwtest.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1135
diff
changeset
|
12236 * 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
|
12237 */ |
|
e24e5a13ff2c
Added code to test the new print functions in dwtest.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1135
diff
changeset
|
12238 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
|
12239 { |
|
1141
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12240 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
|
12241 |
|
1141
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12242 if(p) |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12243 p->drawfunc = NULL; |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12244 } |
|
8d8c73fb27f4
Initial implementation of printing support on Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1137
diff
changeset
|
12245 |
|
1783
9de6d1cc8fb8
Put test program code into DEPRECATED #ifdef again to avoid build warnings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1782
diff
changeset
|
12246 /* |
|
9de6d1cc8fb8
Put test program code into DEPRECATED #ifdef again to avoid build warnings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1782
diff
changeset
|
12247 * 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
|
12248 * Parameters: |
|
9de6d1cc8fb8
Put test program code into DEPRECATED #ifdef again to avoid build warnings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1782
diff
changeset
|
12249 * 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
|
12250 * Returns: |
|
1784
86ace55df07b
Added UTF8/Wide conversion functions on OS/2 and Windows...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1783
diff
changeset
|
12251 * 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
|
12252 * 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
|
12253 */ |
|
9de6d1cc8fb8
Put test program code into DEPRECATED #ifdef again to avoid build warnings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1782
diff
changeset
|
12254 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
|
12255 { |
|
9de6d1cc8fb8
Put test program code into DEPRECATED #ifdef again to avoid build warnings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1782
diff
changeset
|
12256 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
|
12257 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
|
12258 if(temp) |
|
86ace55df07b
Added UTF8/Wide conversion functions on OS/2 and Windows...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1783
diff
changeset
|
12259 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
|
12260 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
|
12261 } |
|
9de6d1cc8fb8
Put test program code into DEPRECATED #ifdef again to avoid build warnings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1782
diff
changeset
|
12262 |
|
9de6d1cc8fb8
Put test program code into DEPRECATED #ifdef again to avoid build warnings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1782
diff
changeset
|
12263 /* |
|
9de6d1cc8fb8
Put test program code into DEPRECATED #ifdef again to avoid build warnings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1782
diff
changeset
|
12264 * 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
|
12265 * Parameters: |
|
9de6d1cc8fb8
Put test program code into DEPRECATED #ifdef again to avoid build warnings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1782
diff
changeset
|
12266 * 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
|
12267 * Returns: |
|
1784
86ace55df07b
Added UTF8/Wide conversion functions on OS/2 and Windows...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1783
diff
changeset
|
12268 * 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
|
12269 * 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
|
12270 */ |
|
9de6d1cc8fb8
Put test program code into DEPRECATED #ifdef again to avoid build warnings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1782
diff
changeset
|
12271 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
|
12272 { |
|
9de6d1cc8fb8
Put test program code into DEPRECATED #ifdef again to avoid build warnings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1782
diff
changeset
|
12273 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
|
12274 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
|
12275 if(temp) |
|
86ace55df07b
Added UTF8/Wide conversion functions on OS/2 and Windows...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
1783
diff
changeset
|
12276 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
|
12277 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
|
12278 } |