@@ -10,9 +10,6 @@ use crate::{
10
10
use accesskit_macos:: { Adapter , NSObject , NSPoint , QueuedEvents , SubclassingAdapter } ;
11
11
use std:: { os:: raw:: c_void, ptr} ;
12
12
13
- #[ cfg( not( feature = "cbindgen" ) ) ]
14
- pub type NSArray = c_void ;
15
-
16
13
pub struct macos_queued_events {
17
14
_private : [ u8 ; 0 ] ,
18
15
}
@@ -74,29 +71,31 @@ impl macos_adapter {
74
71
BoxCastPtr :: to_mut_ptr ( events)
75
72
}
76
73
74
+ /// Returns a pointer to an `NSArray`. Ownership of the pointer is not transfered.
77
75
#[ no_mangle]
78
76
pub extern "C" fn accesskit_macos_adapter_view_children (
79
77
adapter : * const macos_adapter ,
80
- ) -> * mut NSArray {
78
+ ) -> * mut c_void {
81
79
let adapter = ref_from_ptr ( adapter) ;
82
80
adapter. view_children ( ) as * mut _
83
81
}
84
82
83
+ /// Returns a pointer to an `NSObject`. Ownership of the pointer is not transfered.
85
84
#[ no_mangle]
86
- pub extern "C" fn accesskit_macos_adapter_focus (
87
- adapter : * const macos_adapter ,
88
- ) -> * mut NSObject {
85
+ pub extern "C" fn accesskit_macos_adapter_focus ( adapter : * const macos_adapter ) -> * mut c_void {
89
86
let adapter = ref_from_ptr ( adapter) ;
90
- adapter. focus ( )
87
+ adapter. focus ( ) as * mut _
91
88
}
92
89
90
+ /// Returns a pointer to an `NSObject`. Ownership of the pointer is not transfered.
93
91
#[ no_mangle]
94
92
pub extern "C" fn accesskit_macos_adapter_hit_test (
95
93
adapter : * const macos_adapter ,
96
- point : NSPoint ,
97
- ) -> * mut NSObject {
94
+ x : f64 ,
95
+ y : f64 ,
96
+ ) -> * mut c_void {
98
97
let adapter = ref_from_ptr ( adapter) ;
99
- adapter. hit_test ( point )
98
+ adapter. hit_test ( NSPoint :: new ( x , y ) ) as * mut _
100
99
}
101
100
}
102
101
0 commit comments