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/osx | |
| parent | 08977ff115fca510f0152cf26ccf3df24640d8b4 (diff) | |
fix OSX and Windows builds
after my "Convert SALEVENT to scoped enum" commit
Change-Id: Ib4a3f0e18fa5d8160446d5b5cd505bae651da7d5
Diffstat (limited to 'vcl/osx')
| -rw-r--r-- | vcl/osx/salframe.cxx | 4 | ||||
| -rw-r--r-- | vcl/osx/salframeview.mm | 2 | ||||
| -rw-r--r-- | vcl/osx/salinst.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index a084520cbc78..a1498c512518 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -1245,7 +1245,7 @@ void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight, sal_u // #i113170# may not be the main thread if called from UNO API SalData::ensureThreadAutoreleasePool(); - sal_uInt16 nEvent = 0; + SalEvent nEvent = SalEvent::NONE; if( [mpNSWindow isMiniaturized] ) [mpNSWindow deminiaturize: NSApp]; // expand the window @@ -1314,7 +1314,7 @@ void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight, sal_u UpdateFrameGeometry(); - if (nEvent) + if (nEvent != SalEvent::NONE) CallCallback(nEvent, nullptr); if( mbShown && bPaint ) diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm index 246ca40cf844..6906f9be3eee 100644 --- a/vcl/osx/salframeview.mm +++ b/vcl/osx/salframeview.mm @@ -549,7 +549,7 @@ private: } } --(void)sendMouseEventToFrame: (NSEvent*)pEvent button:(sal_uInt16)nButton eventtype:(sal_uInt16)nEvent +-(void)sendMouseEventToFrame: (NSEvent*)pEvent button:(sal_uInt16)nButton eventtype:(SalEvent)nEvent { SolarMutexGuard aGuard; diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index 2d57b4a01649..10e3f2fcb117 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -387,7 +387,7 @@ void AquaSalInstance::wakeupYield() } } -void AquaSalInstance::PostUserEvent( AquaSalFrame* pFrame, sal_uInt16 nType, void* pData ) +void AquaSalInstance::PostUserEvent( AquaSalFrame* pFrame, SalEvent nType, void* pData ) { { osl::MutexGuard g( maUserEventListMutex ); |