|
|
|
@ -54,7 +54,6 @@ public: |
|
|
|
FORWARD_IUNKNOWN() |
|
|
|
virtual ~WindowBaseImpl() |
|
|
|
{ |
|
|
|
NSDebugLog(@"~WindowBaseImpl()"); |
|
|
|
View = NULL; |
|
|
|
Window = NULL; |
|
|
|
} |
|
|
|
@ -161,22 +160,6 @@ public: |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
virtual HRESULT GetMaxClientSize(AvnSize* ret) override |
|
|
|
{ |
|
|
|
@autoreleasepool |
|
|
|
{ |
|
|
|
if(ret == nullptr) |
|
|
|
return E_POINTER; |
|
|
|
|
|
|
|
auto size = [NSScreen.screens objectAtIndex:0].frame.size; |
|
|
|
|
|
|
|
ret->Height = size.height; |
|
|
|
ret->Width = size.width; |
|
|
|
|
|
|
|
return S_OK; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
virtual HRESULT GetScaling (double* ret) override |
|
|
|
{ |
|
|
|
@autoreleasepool |
|
|
|
@ -416,8 +399,8 @@ private: |
|
|
|
INHERIT_INTERFACE_MAP(WindowBaseImpl) |
|
|
|
INTERFACE_MAP_ENTRY(IAvnWindow, IID_IAvnWindow) |
|
|
|
END_INTERFACE_MAP() |
|
|
|
virtual ~WindowImpl(){ |
|
|
|
NSDebugLog(@"~WindowImpl"); |
|
|
|
virtual ~WindowImpl() |
|
|
|
{ |
|
|
|
} |
|
|
|
|
|
|
|
ComPtr<IAvnWindowEvents> WindowEvents; |
|
|
|
@ -664,10 +647,8 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent |
|
|
|
|
|
|
|
- (void)dealloc |
|
|
|
{ |
|
|
|
NSDebugLog(@"AvnView dealloc"); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
- (void)onClosed |
|
|
|
{ |
|
|
|
_parent = NULL; |
|
|
|
@ -1067,7 +1048,6 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent |
|
|
|
|
|
|
|
- (void)dealloc |
|
|
|
{ |
|
|
|
NSDebugLog(@"AvnWindow dealloc"); |
|
|
|
} |
|
|
|
|
|
|
|
- (void)pollModalSession:(nonnull NSModalSession)session |
|
|
|
|