[Libreoffice-commits] core.git: vcl/inc vcl/osx vcl/win

[Noel Grandin]

 vcl/inc/osx/salframeview.h  |    4 +++-
 vcl/inc/osx/salinst.h       |    2 +-
 vcl/osx/salframe.cxx        |    4 ++--
 vcl/osx/salframeview.mm     |    2 +-
 vcl/osx/salinst.cxx         |    2 +-
 vcl/win/window/salframe.cxx |    2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit f6fb8a152797de4c5339b2fa5a3adf0e2ee0c349
Author: Noel Grandin <noel at peralex.com>
Date:   Tue May 10 12:16:45 2016 +0200

    fix OSX and Windows builds
    
    after my "Convert SALEVENT to scoped enum" commit
    
    Change-Id: Ib4a3f0e18fa5d8160446d5b5cd505bae651da7d5

diff --git a/vcl/inc/osx/salframeview.h b/vcl/inc/osx/salframeview.h
index bb922b8..0d32266 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 82bdfde..20f3e3e 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 a084520..a1498c5 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 246ca40..6906f9b 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 2d57b4a..10e3f2f 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 47aa4dd..2f057d3 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 );
 }