diff options
author | Herbert Dürr <hdu@apache.org> | 2014-01-23 16:56:03 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-24 11:05:46 +0000 |
commit | e4653eee7680831e6d0995d51d80fb63309c03ab (patch) | |
tree | 078ef816c2fa12397403361263e87239dbf308d3 /vcl/inc | |
parent | 4b0d7b61ba828785064133e40f960a464c1c147a (diff) |
Related: #i123895# adjust VCL support for 64bit OSX port
(cherry picked from commit 677d987b931c509c4240840c4f21ccad2b518b12)
Conflicts:
vcl/aqua/source/a11y/aqua11ywrapperrow.mm
vcl/inc/aqua/aquavcltypes.h
vcl/inc/quartz/salgdi.h
vcl/osx/DropTarget.cxx
vcl/osx/salframe.cxx
vcl/osx/salinst.cxx
vcl/osx/salmenu.cxx
vcl/osx/vclnsapp.mm
Change-Id: I30d72e7caa1269982d176bc4d3baf604d5e7a84b
Diffstat (limited to 'vcl/inc')
-rw-r--r-- | vcl/inc/osx/salframeview.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vcl/inc/osx/salframeview.h b/vcl/inc/osx/salframeview.h index 3217499b8881..db3d588dec70 100644 --- a/vcl/inc/osx/salframeview.h +++ b/vcl/inc/osx/salframeview.h @@ -22,7 +22,7 @@ #include "osx/a11ywrapper.h" -@interface SalFrameWindow : NSWindow +@interface SalFrameWindow : NSWindow<NSWindowDelegate> { AquaSalFrame* mpFrame; id mDraggingDestinationHandler; @@ -38,6 +38,9 @@ -(void)windowDidMiniaturize: (NSNotification*)pNotification; -(void)windowDidDeminiaturize: (NSNotification*)pNotification; -(BOOL)windowShouldClose: (NSNotification*)pNotification; +//-(void)willEncodeRestorableState:(NSCoder*)pCoderState; +//-(void)didDecodeRestorableState:(NSCoder*)pCoderState; +//-(void)windowWillEnterVersionBrowser:(NSNotification*)pNotification; -(void)dockMenuItemTriggered: (id)sender; -(AquaSalFrame*)getSalFrame; -(BOOL)containsMouse; |