diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-10 12:16:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-05-10 12:25:17 +0200 |
| commit | f6fb8a152797de4c5339b2fa5a3adf0e2ee0c349 (patch) | |
| tree | f96d68eae4dd2bd9790d17a029e24118a517a57c /vcl/inc/osx | |
| parent | 08977ff115fca510f0152cf26ccf3df24640d8b4 (diff) | |
fix OSX and Windows builds
after my "Convert SALEVENT to scoped enum" commit
Change-Id: Ib4a3f0e18fa5d8160446d5b5cd505bae651da7d5
Diffstat (limited to 'vcl/inc/osx')
| -rw-r--r-- | vcl/inc/osx/salframeview.h | 4 | ||||
| -rw-r--r-- | vcl/inc/osx/salinst.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/vcl/inc/osx/salframeview.h b/vcl/inc/osx/salframeview.h index bb922b825a06..0d3226680593 100644 --- a/vcl/inc/osx/salframeview.h +++ b/vcl/inc/osx/salframeview.h @@ -22,6 +22,8 @@ #include "osx/a11ywrapper.h" +enum class SalEvent; + @interface SalFrameWindow : NSWindow<NSWindowDelegate> { AquaSalFrame* mpFrame; @@ -103,7 +105,7 @@ -(void)swipeWithEvent: (NSEvent*)pEvent; -(void)keyDown: (NSEvent*)pEvent; -(void)flagsChanged: (NSEvent*)pEvent; --(void)sendMouseEventToFrame:(NSEvent*)pEvent button:(sal_uInt16)nButton eventtype:(sal_uInt16)nEvent; +-(void)sendMouseEventToFrame:(NSEvent*)pEvent button:(sal_uInt16)nButton eventtype:(SalEvent)nEvent; -(BOOL)sendKeyInputAndReleaseToFrame: (sal_uInt16)nKeyCode character: (sal_Unicode)aChar; -(BOOL)sendKeyInputAndReleaseToFrame: (sal_uInt16)nKeyCode character: (sal_Unicode)aChar modifiers: (unsigned int)nMod; -(BOOL)sendKeyToFrameDirect: (sal_uInt16)nKeyCode character: (sal_Unicode)aChar modifiers: (unsigned int)nMod; diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h index 82bdfdefe813..20f3e3e314d5 100644 --- a/vcl/inc/osx/salinst.h +++ b/vcl/inc/osx/salinst.h @@ -141,7 +141,7 @@ public: public: friend class AquaSalFrame; - void PostUserEvent( AquaSalFrame* pFrame, sal_uInt16 nType, void* pData ); + void PostUserEvent( AquaSalFrame* pFrame, SalEvent nType, void* pData ); void delayedSettingsChanged( bool bInvalidate ); bool isNSAppThread() const; |