Browse Source

INSWindowHolder uses NSView and NSWindow types.

pull/8091/head
Dan Walmsley 4 years ago
parent
commit
e76887fe25
  1. 4
      native/Avalonia.Native/src/OSX/INSWindowHolder.h
  2. 4
      native/Avalonia.Native/src/OSX/WindowBaseImpl.h
  3. 4
      native/Avalonia.Native/src/OSX/WindowBaseImpl.mm

4
native/Avalonia.Native/src/OSX/INSWindowHolder.h

@ -10,8 +10,8 @@
struct INSWindowHolder
{
virtual AvnWindow* _Nonnull GetNSWindow () = 0;
virtual AvnView* _Nonnull GetNSView () = 0;
virtual NSWindow* _Nonnull GetNSWindow () = 0;
virtual NSView* _Nonnull GetNSView () = 0;
};
#endif //AVALONIA_NATIVE_OSX_INSWINDOWHOLDER_H

4
native/Avalonia.Native/src/OSX/WindowBaseImpl.h

@ -51,9 +51,9 @@ BEGIN_INTERFACE_MAP()
virtual HRESULT ObtainNSViewHandleRetained(void **ret) override;
virtual AvnWindow *GetNSWindow() override;
virtual NSWindow *GetNSWindow() override;
virtual AvnView *GetNSView() override;
virtual NSView *GetNSView() override;
virtual HRESULT Show(bool activate, bool isDialog) override;

4
native/Avalonia.Native/src/OSX/WindowBaseImpl.mm

@ -60,11 +60,11 @@ HRESULT WindowBaseImpl::ObtainNSViewHandleRetained(void **ret) {
return S_OK;
}
AvnWindow *WindowBaseImpl::GetNSWindow() {
NSWindow *WindowBaseImpl::GetNSWindow() {
return Window;
}
AvnView *WindowBaseImpl::GetNSView() {
NSView *WindowBaseImpl::GetNSView() {
return View;
}

Loading…
Cancel
Save