summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-05-10 12:16:45 +0200
committerNoel Grandin <noel@peralex.com>2016-05-10 12:25:17 +0200
commitf6fb8a152797de4c5339b2fa5a3adf0e2ee0c349 (patch)
treef96d68eae4dd2bd9790d17a029e24118a517a57c
parent08977ff115fca510f0152cf26ccf3df24640d8b4 (diff)
fix OSX and Windows builds
after my "Convert SALEVENT to scoped enum" commit Change-Id: Ib4a3f0e18fa5d8160446d5b5cd505bae651da7d5
-rw-r--r--vcl/inc/osx/salframeview.h4
-rw-r--r--vcl/inc/osx/salinst.h2
-rw-r--r--vcl/osx/salframe.cxx4
-rw-r--r--vcl/osx/salframeview.mm2
-rw-r--r--vcl/osx/salinst.cxx2
-rw-r--r--vcl/win/window/salframe.cxx2
6 files changed, 9 insertions, 7 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;
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 );
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 47aa4ddd543f..2f057d3eba3e 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -1434,7 +1434,7 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight,
UpdateFrameGeometry( mhWnd, this );
// Notification -- really ???
- if( nEvent )
+ if( nEvent != SalEvent::NONE )
CallCallback( nEvent, NULL );
}