diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-10 11:49:59 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-05-10 11:49:59 +0200 |
| commit | 034e481613742e7fc6f9d14c34dd1896bc1ba671 (patch) | |
| tree | 95b8ff8d1c2e6f3cac794504673cc2295dcd66ad /vcl | |
| parent | 22188da2410f90c2cc533b529314fae73f3b29fd (diff) | |
fix Windows and OSX build
after my "Convert SAL_EVENT to scoped enum" commit
Change-Id: I1a52a1e3428c9b68d67bd521a3136f3a529392f5
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/winproc.cxx | 4 | ||||
| -rw-r--r-- | vcl/win/window/salframe.cxx | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index c16818e5ce2b..5e30d5b24e28 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -2609,11 +2609,11 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalEvent nEvent, const void* pE break; -#ifdef DBG_UTIL default: +#ifdef DBG_UTIL SAL_WARN( "vcl.layout", "ImplWindowFrameProc(): unknown event (" << (int)nEvent << ")" ); - break; #endif + break; } return bRet; diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index 7e57d5d56789..47aa4ddd543f 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -1245,7 +1245,7 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, ShowWindow( mhWnd, SW_RESTORE ); } - sal_uInt16 nEvent = 0; + SalEvent nEvent = SalEvent::NONE; UINT nPosSize = 0; RECT aClientRect, aWindowRect; GetClientRect( mhWnd, &aClientRect ); // x,y always 0,0, but width and height without border @@ -3020,7 +3020,7 @@ static long ImplHandleMouseMsg( HWND hWnd, UINT nMsg, } SalMouseEvent aMouseEvt; long nRet; - sal_uInt16 nEvent = 0; + SalEvent nEvent = SalEvent::NONE; bool bCall = TRUE; aMouseEvt.mnX = (short)LOWORD( lParam ); @@ -3514,9 +3514,9 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg, else { SalKeyEvent aKeyEvt; - sal_uInt16 nEvent; + SalEvent nEvent; MSG aCharMsg; - BOOL bCharPeek = FALSE; + BOOL bCharPeek = FALSE; UINT nCharMsg = WM_CHAR; bool bKeyUp = (nMsg == WM_KEYUP) || (nMsg == WM_SYSKEYUP); @@ -3637,7 +3637,7 @@ long ImplHandleSalObjKeyMsg( HWND hWnd, UINT nMsg, if ( (wParam != VK_SHIFT) && (wParam != VK_CONTROL) && (wParam != VK_MENU) ) { SalKeyEvent aKeyEvt; - sal_uInt16 nEvent; + SalEvent nEvent; bool bKeyUp = (nMsg == WM_KEYUP) || (nMsg == WM_SYSKEYUP); // convert KeyCode @@ -4052,7 +4052,7 @@ static long ImplHandleShutDownMsg( HWND hWnd ) static void ImplHandleSettingsChangeMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ) { - sal_uInt16 nSalEvent = SalEvent::SettingsChanged; + SalEvent nSalEvent = SalEvent::SettingsChanged; if ( nMsg == WM_DEVMODECHANGE ) nSalEvent = SalEvent::PrinterChanged; |