diff options
Diffstat (limited to 'vcl/win/source/window')
| -rw-r--r-- | vcl/win/source/window/keynames.cxx | 5 | ||||
| -rw-r--r-- | vcl/win/source/window/salframe.cxx | 218 | ||||
| -rw-r--r-- | vcl/win/source/window/salmenu.cxx | 17 | ||||
| -rw-r--r-- | vcl/win/source/window/salobj.cxx | 41 |
4 files changed, 0 insertions, 281 deletions
diff --git a/vcl/win/source/window/keynames.cxx b/vcl/win/source/window/keynames.cxx index 00dd4351d076..0038ae9dc211 100644 --- a/vcl/win/source/window/keynames.cxx +++ b/vcl/win/source/window/keynames.cxx @@ -44,7 +44,6 @@ #define PAPUGA_KEY_SHIFT 0x22A0000 #define PAPUGA_KEY_ALT 0x2380000 - namespace vcl_sal { struct KeysNameReplacement @@ -60,14 +59,10 @@ namespace vcl_sal { int nReplacements; }; - - // CAUTION CAUTION CAUTION // Every string value in the replacements tables must be in UTF-8 // but with the UTF-8 bytes encoded, not as such! Be careful! - - static const struct KeysNameReplacement aImplReplacements_Asturian[] = { { PAPUGA_KEY_BACK, "Retrocesu" }, diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 1aa874331fb3..90b36e034a58 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -113,21 +113,15 @@ using namespace ::com::sun::star::beans; # define WM_MOUSEHWHEEL 0x020E #endif - - const unsigned int WM_USER_SYSTEM_WINDOW_ACTIVATED = RegisterWindowMessageA("SYSTEM_WINDOW_ACTIVATED"); bool WinSalFrame::mbInReparent = FALSE; - - // Macros for support of WM_UNICHAR & Keyman 6.0 //#define Uni_UTF32ToSurrogate1(ch) (((unsigned long) (ch) - 0x10000) / 0x400 + 0xD800) #define Uni_UTF32ToSurrogate2(ch) (((unsigned long) (ch) - 0x10000) % 0x400 + 0xDC00) #define Uni_SupplementaryPlanesStart 0x10000 - - static void UpdateFrameGeometry( HWND hWnd, WinSalFrame* pFrame ); static void SetMaximizedFrameGeometry( HWND hWnd, WinSalFrame* pFrame, RECT* pParentRect = NULL ); @@ -197,8 +191,6 @@ static void ImplSaveFrameState( WinSalFrame* pFrame ) } } - - // if pParentRect is set, the workarea of the monitor that contains pParentRect is returned void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT *pParentRect ) { @@ -282,8 +274,6 @@ void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT *pParentRect ) } } - - SalFrame* ImplSalCreateFrame( WinSalInstance* pInst, HWND hWndParent, sal_uLong nSalFrameStyle ) { @@ -525,8 +515,6 @@ HWND ImplSalReCreateHWND( HWND hWndParent, HWND oldhWnd, bool bAsChild ) hWndParent, 0, hInstance, (void*)GetWindowPtr( oldhWnd ) ); } - - // translation table from System keycodes into StartView keycodes #define KEY_TAB_SIZE 146 @@ -681,8 +669,6 @@ static const sal_uInt16 aImplTranslateKeyTab[KEY_TAB_SIZE] = 0 // SCROLLLOCK 145 }; - - static UINT ImplSalGetWheelScrollLines() { UINT nScrLines = 0; @@ -703,8 +689,6 @@ static UINT ImplSalGetWheelScrollLines() return nScrLines; } - - static UINT ImplSalGetWheelScrollChars() { UINT nScrChars = 0; @@ -729,8 +713,6 @@ static UINT ImplSalGetWheelScrollChars() return nScrChars; } - - static void ImplSalAddBorder( const WinSalFrame* pFrame, int& width, int& height ) { // transform client size into window size @@ -745,8 +727,6 @@ static void ImplSalAddBorder( const WinSalFrame* pFrame, int& width, int& height height = aWinRect.bottom - aWinRect.top + 1; } - - static void ImplSalCalcFullScreenSize( const WinSalFrame* pFrame, int& rX, int& rY, int& rDX, int& rDY ) { @@ -824,8 +804,6 @@ static void ImplSalCalcFullScreenSize( const WinSalFrame* pFrame, rDY = nScreenDY+(nFrameY*2)+nCaptionY; } - - static void ImplSalFrameFullScreenPos( WinSalFrame* pFrame, bool bAlways = FALSE ) { if ( bAlways || !IsIconic( pFrame->mhWnd ) ) @@ -842,8 +820,6 @@ static void ImplSalFrameFullScreenPos( WinSalFrame* pFrame, bool bAlways = FALSE } } - - WinSalFrame::WinSalFrame() { SalData* pSalData = GetSalData(); @@ -912,7 +888,6 @@ WinSalFrame::WinSalFrame() pSalData->mpFirstFrame = this; } - void WinSalFrame::updateScreenNumber() { if( mnDisplay == -1 ) // spans all monitors @@ -935,8 +910,6 @@ void WinSalFrame::updateScreenNumber() } } - - WinSalFrame::~WinSalFrame() { SalData* pSalData = GetSalData(); @@ -992,8 +965,6 @@ WinSalFrame::~WinSalFrame() } } - - SalGraphics* WinSalFrame::AcquireGraphics() { if ( mbGraphics ) @@ -1071,8 +1042,6 @@ SalGraphics* WinSalFrame::AcquireGraphics() } } - - void WinSalFrame::ReleaseGraphics( SalGraphics* pGraphics ) { if ( mpGraphics2 == pGraphics ) @@ -1095,15 +1064,11 @@ void WinSalFrame::ReleaseGraphics( SalGraphics* pGraphics ) mbGraphics = FALSE; } - - bool WinSalFrame::PostEvent( void* pData ) { return (bool)ImplPostMessage( mhWnd, SAL_MSG_USEREVENT, 0, (LPARAM)pData ); } - - void WinSalFrame::SetTitle( const OUString& rTitle ) { DBG_ASSERT( sizeof( WCHAR ) == sizeof( sal_Unicode ), "WinSalFrame::SetTitle(): WCHAR != sal_Unicode" ); @@ -1111,8 +1076,6 @@ void WinSalFrame::SetTitle( const OUString& rTitle ) SetWindowTextW( mhWnd, reinterpret_cast<LPCWSTR>(rTitle.getStr()) ); } - - void WinSalFrame::SetIcon( sal_uInt16 nIcon ) { // If we have a window without an Icon (for example a dialog), ignore this call @@ -1133,8 +1096,6 @@ void WinSalFrame::SetIcon( sal_uInt16 nIcon ) ImplSendMessage( mhWnd, WM_SETICON, ICON_SMALL, (LPARAM)hSmIcon ); } - - void WinSalFrame::SetMenu( SalMenu* pSalMenu ) { WinSalMenu* pWMenu = static_cast<WinSalMenu*>(pSalMenu); @@ -1147,7 +1108,6 @@ void WinSalFrame::DrawMenuBar() ::DrawMenuBar( mhWnd ); } - HWND ImplGetParentHwnd( HWND hWnd ) { WinSalFrame* pFrame = GetWindowPtr( hWnd ); @@ -1161,15 +1121,11 @@ HWND ImplGetParentHwnd( HWND hWnd ) } - - SalFrame* WinSalFrame::GetParent() const { return GetWindowPtr( ImplGetParentHwnd( mhWnd ) ); } - - static void ImplSalShow( HWND hWnd, bool bVisible, bool bNoActivate ) { WinSalFrame* pFrame = GetWindowPtr( hWnd ); @@ -1246,15 +1202,10 @@ static void ImplSalShow( HWND hWnd, bool bVisible, bool bNoActivate ) } } - - - void WinSalFrame::SetExtendedFrameStyle( SalExtStyle ) { } - - void WinSalFrame::Show( bool bVisible, bool bNoActivate ) { // Post this Message to the window, because this only works @@ -1266,15 +1217,11 @@ void WinSalFrame::Show( bool bVisible, bool bNoActivate ) ImplSalShow( mhWnd, bVisible, bNoActivate ); } - - void WinSalFrame::Enable( bool bEnable ) { EnableWindow( mhWnd, bEnable ); } - - void WinSalFrame::SetMinClientSize( long nWidth, long nHeight ) { mnMinWidth = nWidth; @@ -1287,8 +1234,6 @@ void WinSalFrame::SetMaxClientSize( long nWidth, long nHeight ) mnMaxHeight = nHeight; } - - void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) { @@ -1390,7 +1335,6 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, int nScreenWidth; int nScreenHeight; - RECT aRect; ImplSalGetWorkArea( mhWnd, &aRect, NULL ); nScreenX = aRect.left; @@ -1448,7 +1392,6 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, nY = ((aRect2.bottom-aRect2.top)-nHeight)/2 + aRect2.top; } - //if ( bVisible ) // mbDefPos = FALSE; @@ -1457,7 +1400,6 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, nEvent = SALEVENT_MOVERESIZE; } - // Adjust Window in the screen bool bCheckOffScreen = TRUE; @@ -1500,8 +1442,6 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, CallCallback( nEvent, NULL ); } - - static void ImplSetParentFrame( WinSalFrame* pThis, HWND hNewParentWnd, bool bAsChild ) { // save hwnd, will be overwritten in WM_CREATE during createwindow @@ -1635,7 +1575,6 @@ static void ImplSetParentFrame( WinSalFrame* pThis, HWND hNewParentWnd, bool bAs } } - // TODO: add SetParent() call for SalObjects DBG_ASSERT( systemChildren.empty(), "WinSalFrame::SetParent() parent of living system child window will be destroyed!"); @@ -1651,8 +1590,6 @@ static void ImplSetParentFrame( WinSalFrame* pThis, HWND hNewParentWnd, bool bAs SAL_MSG_DESTROYHWND, (WPARAM) 0, (LPARAM)hWndOld); } - - void WinSalFrame::SetParent( SalFrame* pNewParent ) { WinSalFrame::mbInReparent = TRUE; @@ -1673,9 +1610,6 @@ bool WinSalFrame::SetPluginParent( SystemParentData* pNewParent ) return true; } - - - void WinSalFrame::GetWorkArea( Rectangle &rRect ) { RECT aRect; @@ -1686,16 +1620,12 @@ void WinSalFrame::GetWorkArea( Rectangle &rRect ) rRect.Bottom() = aRect.bottom-1; } - - void WinSalFrame::GetClientSize( long& rWidth, long& rHeight ) { rWidth = maGeometry.nWidth; rHeight = maGeometry.nHeight; } - - void WinSalFrame::SetWindowState( const SalFrameState* pState ) { // Check if the window fits into the screen, in case the screen @@ -1855,8 +1785,6 @@ void WinSalFrame::SetWindowState( const SalFrameState* pState ) mbDefPos = FALSE; // window was positioned } - - bool WinSalFrame::GetWindowState( SalFrameState* pState ) { if ( maState.mnWidth && maState.mnHeight ) @@ -1873,8 +1801,6 @@ bool WinSalFrame::GetWindowState( SalFrameState* pState ) return FALSE; } - - void WinSalFrame::SetScreenNumber( unsigned int nNewScreen ) { WinSalSystem* pSys = static_cast<WinSalSystem*>(ImplGetSalSystem()); @@ -1944,8 +1870,6 @@ void WinSalFrame::SetApplicationID( const OUString &rApplicationID ) } } - - void WinSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) { if ( (mbFullScreen == bFullScreen) && (!bFullScreen || (mnDisplay == nDisplay)) ) @@ -2009,8 +1933,6 @@ void WinSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) } } - - void WinSalFrame::StartPresentation( bool bStart ) { if ( mbPresentation == bStart ) @@ -2064,8 +1986,6 @@ void WinSalFrame::StartPresentation( bool bStart ) } } - - void WinSalFrame::SetAlwaysOnTop( bool bOnTop ) { HWND hWnd; @@ -2076,8 +1996,6 @@ void WinSalFrame::SetAlwaysOnTop( bool bOnTop ) SetWindowPos( mhWnd, hWnd, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE ); } - - static void ImplSalToTop( HWND hWnd, sal_uInt16 nFlags ) { WinSalFrame* pToTopFrame = GetWindowPtr( hWnd ); @@ -2131,8 +2049,6 @@ static void ImplSalToTop( HWND hWnd, sal_uInt16 nFlags ) } } - - void WinSalFrame::ToTop( sal_uInt16 nFlags ) { nFlags &= ~SAL_FRAME_TOTOP_GRABFOCUS; // this flag is not needed on win32 @@ -2145,8 +2061,6 @@ void WinSalFrame::ToTop( sal_uInt16 nFlags ) ImplSalToTop( mhWnd, nFlags ); } - - void WinSalFrame::SetPointer( PointerStyle ePointerStyle ) { struct ImplPtrData @@ -2280,8 +2194,6 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle ) } } - - void WinSalFrame::CaptureMouse( bool bCapture ) { // Send this Message to the window, because CaptureMouse() only work @@ -2294,8 +2206,6 @@ void WinSalFrame::CaptureMouse( bool bCapture ) ImplSendMessage( mhWnd, nMsg, 0, 0 ); } - - void WinSalFrame::SetPointerPos( long nX, long nY ) { POINT aPt; @@ -2305,22 +2215,16 @@ void WinSalFrame::SetPointerPos( long nX, long nY ) SetCursorPos( aPt.x, aPt.y ); } - - void WinSalFrame::Flush() { GdiFlush(); } - - void WinSalFrame::Sync() { GdiFlush(); } - - static void ImplSalFrameSetInputContext( HWND hWnd, const SalInputContext* pContext ) { WinSalFrame* pFrame = GetWindowPtr( hWnd ); @@ -2381,16 +2285,12 @@ static void ImplSalFrameSetInputContext( HWND hWnd, const SalInputContext* pCont } } - - void WinSalFrame::SetInputContext( SalInputContext* pContext ) { // Must be called in the main thread! ImplSendMessage( mhWnd, SAL_MSG_SETINPUTCONTEXT, 0, (LPARAM)(void*)pContext ); } - - static void ImplSalFrameEndExtTextInput( HWND hWnd, sal_uInt16 nFlags ) { HIMC hIMC = ImmGetContext( hWnd ); @@ -2407,16 +2307,12 @@ static void ImplSalFrameEndExtTextInput( HWND hWnd, sal_uInt16 nFlags ) } } - - void WinSalFrame::EndExtTextInput( sal_uInt16 nFlags ) { // Must be called in the main thread! ImplSendMessage( mhWnd, SAL_MSG_ENDEXTTEXTINPUT, (WPARAM)nFlags, 0 ); } - - static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf, UINT& rCount, UINT nMaxSize, const sal_Char* pReplace ) @@ -2487,8 +2383,6 @@ static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf, rCount = 0; } - - OUString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode ) { static const UINT nMaxKeyLen = 350; @@ -2689,15 +2583,11 @@ OUString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode ) return OUString( aKeyBuf, sal::static_int_cast< sal_uInt16 >(nKeyBufLen) ); } - - inline Color ImplWinColorToSal( COLORREF nColor ) { return Color( GetRValue( nColor ), GetGValue( nColor ), GetBValue( nColor ) ); } - - static void ImplSalUpdateStyleFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont ) { ImplSalLogFontToFontW( hDC, rLogFont, rFont ); @@ -2716,8 +2606,6 @@ static void ImplSalUpdateStyleFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rF } } - - static long ImplA2I( const BYTE* pStr ) { long n = 0; @@ -2741,8 +2629,6 @@ static long ImplA2I( const BYTE* pStr ) return n; } - - void WinSalFrame::UpdateSettings( AllSettings& rSettings ) { MouseSettings aMouseSettings = rSettings.GetMouseSettings(); @@ -2979,23 +2865,17 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) WinSalGraphics::updateSettingsNative( rSettings ); } - - const SystemEnvData* WinSalFrame::GetSystemData() const { return &maSysData; } - - void WinSalFrame::Beep() { // a simple beep MessageBeep( 0 ); } - - SalFrame::SalPointerState WinSalFrame::GetPointerState() { SalPointerState aState; @@ -3021,8 +2901,6 @@ SalFrame::SalPointerState WinSalFrame::GetPointerState() return aState; } - - SalFrame::SalIndicatorState WinSalFrame::GetIndicatorState() { SalIndicatorState aState; @@ -3056,15 +2934,11 @@ void WinSalFrame::SimulateKeyPress( sal_uInt16 nKeyCode ) } } - - void WinSalFrame::ResetClipRegion() { SetWindowRgn( mhWnd, 0, TRUE ); } - - void WinSalFrame::BeginSetClipRegion( sal_uLong nRects ) { if( mpClipRgnData ) @@ -3080,8 +2954,6 @@ void WinSalFrame::BeginSetClipRegion( sal_uLong nRects ) mbFirstClipRect = TRUE; } - - void WinSalFrame::UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) { if( ! mpClipRgnData ) @@ -3123,8 +2995,6 @@ void WinSalFrame::UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) mpNextClipRect++; } - - void WinSalFrame::EndSetClipRegion() { if( ! mpClipRgnData ) @@ -3163,8 +3033,6 @@ void WinSalFrame::EndSetClipRegion() } } - - static long ImplHandleMouseMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ) { @@ -3330,8 +3198,6 @@ static long ImplHandleMouseMsg( HWND hWnd, UINT nMsg, return nRet; } - - static long ImplHandleMouseActivateMsg( HWND hWnd ) { WinSalFrame* pFrame = GetWindowPtr( hWnd ); @@ -3350,8 +3216,6 @@ static long ImplHandleMouseActivateMsg( HWND hWnd ) return pFrame->CallCallback( SALEVENT_MOUSEACTIVATE, &aMouseActivateEvt ); } - - static long ImplHandleWheelMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ) { DBG_ASSERT( nMsg == WM_MOUSEWHEEL || @@ -3422,8 +3286,6 @@ static long ImplHandleWheelMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPar return nRet; } - - static sal_uInt16 ImplSalGetKeyCode( WPARAM wParam ) { sal_uInt16 nKeyCode; @@ -3444,8 +3306,6 @@ static sal_uInt16 ImplSalGetKeyCode( WPARAM wParam ) return nKeyCode; } - - static void ImplUpdateInputLang( WinSalFrame* pFrame ) { UINT nLang = LOWORD( GetKeyboardLayout( 0 ) ); @@ -3461,7 +3321,6 @@ static void ImplUpdateInputLang( WinSalFrame* pFrame ) return; } - static sal_Unicode ImplGetCharCode( WinSalFrame* pFrame, WPARAM nCharCode ) { ImplUpdateInputLang( pFrame ); @@ -3471,8 +3330,6 @@ static sal_Unicode ImplGetCharCode( WinSalFrame* pFrame, WPARAM nCharCode ) return (sal_Unicode)nCharCode; } - - LanguageType WinSalFrame::GetInputLanguage() { if( !mnInputLang ) @@ -3484,8 +3341,6 @@ LanguageType WinSalFrame::GetInputLanguage() return (LanguageType) mnInputLang; } - - bool WinSalFrame::MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) { bool bRet = FALSE; @@ -3522,8 +3377,6 @@ bool WinSalFrame::MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangT return bRet; } - - static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT& rResult ) { @@ -3806,8 +3659,6 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg, } } - - long ImplHandleSalObjKeyMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ) { @@ -3859,8 +3710,6 @@ long ImplHandleSalObjKeyMsg( HWND hWnd, UINT nMsg, return 0; } - - long ImplHandleSalObjSysCharMsg( HWND hWnd, WPARAM wParam, LPARAM lParam ) { WinSalFrame* pFrame = GetWindowPtr( hWnd ); @@ -3897,8 +3746,6 @@ long ImplHandleSalObjSysCharMsg( HWND hWnd, WPARAM wParam, LPARAM lParam ) return nRet; } - - static bool ImplHandlePaintMsg( HWND hWnd ) { bool bMutex = FALSE; @@ -3966,8 +3813,6 @@ static bool ImplHandlePaintMsg( HWND hWnd ) return bMutex ? true : false; } - - static void ImplHandlePaintMsg2( HWND hWnd, RECT* pRect ) { // Paint @@ -3986,8 +3831,6 @@ static void ImplHandlePaintMsg2( HWND hWnd, RECT* pRect ) ImplPostMessage( hWnd, SAL_MSG_POSTPAINT, (WPARAM)pRect, 0 ); } - - static void SetMaximizedFrameGeometry( HWND hWnd, WinSalFrame* pFrame, RECT* pParentRect ) { // calculate and set frame geometry of a maximized window - useful if the window is still hidden @@ -4072,8 +3915,6 @@ static void UpdateFrameGeometry( HWND hWnd, WinSalFrame* pFrame ) pFrame->updateScreenNumber(); } - - static void ImplCallMoveHdl( HWND hWnd ) { WinSalFrame* pFrame = GetWindowPtr( hWnd ); @@ -4086,8 +3927,6 @@ static void ImplCallMoveHdl( HWND hWnd ) } } - - static void ImplCallClosePopupsHdl( HWND hWnd ) { WinSalFrame* pFrame = GetWindowPtr( hWnd ); @@ -4097,8 +3936,6 @@ static void ImplCallClosePopupsHdl( HWND hWnd ) } } - - static void ImplHandleMoveMsg( HWND hWnd ) { if ( ImplSalYieldMutexTryToAcquire() ) @@ -4136,8 +3973,6 @@ static void ImplHandleMoveMsg( HWND hWnd ) ImplPostMessage( hWnd, SAL_MSG_POSTMOVE, 0, 0 ); } - - static void ImplCallSizeHdl( HWND hWnd ) { // as Windows can send these messages also, we have to use @@ -4159,8 +3994,6 @@ static void ImplCallSizeHdl( HWND hWnd ) ImplPostMessage( hWnd, SAL_MSG_POSTCALLSIZE, 0, 0 ); } - - static void ImplHandleSizeMsg( HWND hWnd, WPARAM wParam, LPARAM lParam ) { if ( (wParam != SIZE_MAXSHOW) && (wParam != SIZE_MAXHIDE) ) @@ -4180,8 +4013,6 @@ static void ImplHandleSizeMsg( HWND hWnd, WPARAM wParam, LPARAM lParam ) } } - - static void ImplHandleFocusMsg( HWND hWnd ) { if ( ImplSalYieldMutexTryToAcquire() ) @@ -4218,8 +4049,6 @@ static void ImplHandleFocusMsg( HWND hWnd ) ImplPostMessage( hWnd, SAL_MSG_POSTFOCUS, 0, 0 ); } - - static void ImplHandleCloseMsg( HWND hWnd ) { if ( ImplSalYieldMutexTryToAcquire() ) @@ -4236,8 +4065,6 @@ static void ImplHandleCloseMsg( HWND hWnd ) ImplPostMessage( hWnd, WM_CLOSE, 0, 0 ); } - - static long ImplHandleShutDownMsg( HWND hWnd ) { ImplSalYieldMutexAcquireWithWait(); @@ -4251,8 +4078,6 @@ static long ImplHandleShutDownMsg( HWND hWnd ) return nRet; } - - static void ImplHandleSettingsChangeMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ) { @@ -4303,8 +4128,6 @@ static void ImplHandleSettingsChangeMsg( HWND hWnd, UINT nMsg, ImplSalYieldMutexRelease(); } - - static void ImplHandleUserEvent( HWND hWnd, LPARAM lParam ) { ImplSalYieldMutexAcquireWithWait(); @@ -4316,8 +4139,6 @@ static void ImplHandleUserEvent( HWND hWnd, LPARAM lParam ) ImplSalYieldMutexRelease(); } - - static void ImplHandleForcePalette( HWND hWnd ) { SalData* pSalData = GetSalData(); @@ -4350,8 +4171,6 @@ static void ImplHandleForcePalette( HWND hWnd ) } } - - static LRESULT ImplHandlePalette( bool bFrame, HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, int& rDef ) { @@ -4500,8 +4319,6 @@ static LRESULT ImplHandlePalette( bool bFrame, HWND hWnd, UINT nMsg, return nCols; } - - static int ImplHandleMinMax( HWND hWnd, LPARAM lParam ) { int bRet = FALSE; @@ -4577,8 +4394,6 @@ static int ImplHandleMinMax( HWND hWnd, LPARAM lParam ) return bRet; } - - // retrieves the SalMenuItem pointer from a hMenu // the pointer is stored in every item, so if no position // is specified we just use the first item (ie, pos=0) @@ -5098,8 +4913,6 @@ static int ImplHandleSysCommand( HWND hWnd, WPARAM wParam, LPARAM lParam ) return FALSE; } - - static void ImplHandleInputLangChange( HWND hWnd, WPARAM, LPARAM lParam ) { ImplSalYieldMutexAcquireWithWait(); @@ -5131,8 +4944,6 @@ static void ImplHandleInputLangChange( HWND hWnd, WPARAM, LPARAM lParam ) ImplSalYieldMutexRelease(); } - - static void ImplUpdateIMECursorPos( WinSalFrame* pFrame, HIMC hIMC ) { COMPOSITIONFORM aForm; @@ -5162,8 +4973,6 @@ static void ImplUpdateIMECursorPos( WinSalFrame* pFrame, HIMC hIMC ) } } - - static bool ImplHandleIMEStartComposition( HWND hWnd ) { bool bDef = TRUE; @@ -5192,8 +5001,6 @@ static bool ImplHandleIMEStartComposition( HWND hWnd ) return bDef; } - - static bool ImplHandleIMECompositionInput( WinSalFrame* pFrame, HIMC hIMC, LPARAM lParam ) { @@ -5323,8 +5130,6 @@ static bool ImplHandleIMECompositionInput( WinSalFrame* pFrame, return !bDef; } - - static bool ImplHandleIMEComposition( HWND hWnd, LPARAM lParam ) { bool bDef = TRUE; @@ -5370,8 +5175,6 @@ static bool ImplHandleIMEComposition( HWND hWnd, LPARAM lParam ) return bDef; } - - static bool ImplHandleIMEEndComposition( HWND hWnd ) { bool bDef = TRUE; @@ -5390,8 +5193,6 @@ static bool ImplHandleIMEEndComposition( HWND hWnd ) return bDef; } - - static boolean ImplHandleAppCommand( HWND hWnd, LPARAM lParam ) { sal_Int16 nCommand = 0; @@ -5437,7 +5238,6 @@ static boolean ImplHandleAppCommand( HWND hWnd, LPARAM lParam ) return false; } - static void ImplHandleIMENotify( HWND hWnd, WPARAM wParam ) { if ( wParam == (WPARAM)IMN_OPENCANDIDATE ) @@ -5491,8 +5291,6 @@ static void ImplHandleIMENotify( HWND hWnd, WPARAM wParam ) } } - - static bool ImplHandleGetObject(HWND hWnd, LPARAM lParam, WPARAM wParam, LRESULT & nRet) { @@ -5531,8 +5329,6 @@ ImplHandleGetObject(HWND hWnd, LPARAM lParam, WPARAM wParam, LRESULT & nRet) return false; } - - static LRESULT ImplHandleIMEReconvertString( HWND hWnd, LPARAM lParam ) { WinSalFrame* pFrame = GetWindowPtr( hWnd ); @@ -5586,8 +5382,6 @@ static LRESULT ImplHandleIMEReconvertString( HWND hWnd, LPARAM lParam ) return nRet; } - - static LRESULT ImplHandleIMEConfirmReconvertString( HWND hWnd, LPARAM lParam ) { WinSalFrame* pFrame = GetWindowPtr( hWnd ); @@ -5654,8 +5448,6 @@ static LRESULT ImplHandleIMEQueryCharPosition( HWND hWnd, LPARAM lParam ) { return TRUE; } - - void SalTestMouseLeave() { SalData* pSalData = GetSalData(); @@ -5669,8 +5461,6 @@ void SalTestMouseLeave() } } - - static int ImplSalWheelMousePos( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam , LRESULT& rResult ) { @@ -5699,8 +5489,6 @@ static int ImplSalWheelMousePos( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPa return TRUE; } - - LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, int& rDef ) { LRESULT nRet = 0; @@ -6177,8 +5965,6 @@ LRESULT CALLBACK SalFrameWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM l return nRet; } - - bool ImplHandleGlobalMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT& rlResult ) { // handle all messages concerning all frames so they get processed only once @@ -6200,8 +5986,6 @@ bool ImplHandleGlobalMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, LR return bResult; } - - bool ImplWriteLastError( DWORD lastError, const char *szApiCall ) { static int first=1; @@ -6262,8 +6046,6 @@ bool ImplWriteLastError( DWORD lastError, const char *szApiCall ) return TRUE; } - - #ifdef _WIN32 bool HasAtHook() { diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx index 522bf2134827..075860413b1a 100644 --- a/vcl/win/source/window/salmenu.cxx +++ b/vcl/win/source/window/salmenu.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svsys.h> #include <vcl/menu.hxx> @@ -39,8 +38,6 @@ static DWORD myerr=0; - - bool SalData::IsKnownMenuHandle( HMENU hMenu ) { if( mhMenuSet.find( hMenu ) == mhMenuSet.end() ) @@ -49,8 +46,6 @@ bool SalData::IsKnownMenuHandle( HMENU hMenu ) return TRUE; } - - // WinSalInst factory methods SalMenu* WinSalInstance::CreateMenu( bool bMenuBar, Menu* ) @@ -75,7 +70,6 @@ void WinSalInstance::DestroyMenu( SalMenu* pSalMenu ) delete pSalMenu; } - SalMenuItem* WinSalInstance::CreateMenuItem( const SalItemParams* pItemData ) { if( !pItemData ) @@ -124,9 +118,6 @@ void WinSalInstance::DestroyMenuItem( SalMenuItem* pSalMenuItem ) delete pSalMenuItem; } - - - static void ImplDrawMenuBar( SalMenu *pMenu ) { if( pMenu->VisibleMenuBar() ) @@ -140,9 +131,6 @@ static void ImplDrawMenuBar( SalMenu *pMenu ) } } - - - /* * WinSalMenu */ @@ -377,13 +365,10 @@ void WinSalMenu::GetSystemMenuData( SystemMenuData* pData ) pData->hMenu = mhMenu; } - - /* * SalMenuItem */ - WinSalMenuItem::WinSalMenuItem() { memset( &mInfo, 0, sizeof( MENUITEMINFOW ) ); @@ -398,6 +383,4 @@ WinSalMenuItem::~WinSalMenuItem() ImplRemoveItemById( mpSalMenu, mnId ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx index 981937638e25..d79c52271b4c 100644 --- a/vcl/win/source/window/salobj.cxx +++ b/vcl/win/source/window/salobj.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <string.h> #include <svsys.h> @@ -31,8 +30,6 @@ #include <win/salframe.h> #include <win/salobj.h> - - static bool ImplIsSysWindowOrChild( HWND hWndParent, HWND hWndChild ) { if ( hWndParent == hWndChild ) @@ -52,8 +49,6 @@ static bool ImplIsSysWindowOrChild( HWND hWndParent, HWND hWndChild ) return FALSE; } - - WinSalObject* ImplFindSalObject( HWND hWndChild ) { SalData* pSalData = GetSalData(); @@ -69,8 +64,6 @@ WinSalObject* ImplFindSalObject( HWND hWndChild ) return NULL; } - - WinSalFrame* ImplFindSalObjectFrame( HWND hWnd ) { WinSalFrame* pFrame = NULL; @@ -92,8 +85,6 @@ WinSalFrame* ImplFindSalObjectFrame( HWND hWnd ) return pFrame; } - - LRESULT CALLBACK SalSysMsgProc( int nCode, WPARAM wParam, LPARAM lParam ) { // Used for Unicode and none Unicode @@ -149,8 +140,6 @@ LRESULT CALLBACK SalSysMsgProc( int nCode, WPARAM wParam, LPARAM lParam ) return CallNextHookEx( pSalData->mhSalObjMsgHook, nCode, wParam, lParam ); } - - bool ImplSalPreDispatchMsg( MSG* pMsg ) { // Used for Unicode and none Unicode @@ -234,8 +223,6 @@ bool ImplSalPreDispatchMsg( MSG* pMsg ) return FALSE; } - - void ImplSalPostDispatchMsg( MSG* pMsg, LRESULT /* nDispatchResult */ ) { // Used for Unicode and none Unicode @@ -260,8 +247,6 @@ void ImplSalPostDispatchMsg( MSG* pMsg, LRESULT /* nDispatchResult */ ) pSalData->mnSalObjWantKeyEvt = 0; } - - LRESULT CALLBACK SalSysObjWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, int& rDef ) { WinSalObject* pSysObj; @@ -388,8 +373,6 @@ LRESULT CALLBACK SalSysObjWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM return nRet; } - - LRESULT CALLBACK SalSysObjChildWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, int& rDef ) { LRESULT nRet = 0; @@ -470,8 +453,6 @@ LRESULT CALLBACK SalSysObjChildWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LP return nRet; } - - SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent ) { SalData* pSalData = GetSalData(); @@ -567,8 +548,6 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent ) return NULL; } - - WinSalObject::WinSalObject() { SalData* pSalData = GetSalData(); @@ -584,8 +563,6 @@ WinSalObject::WinSalObject() pSalData->mpFirstObject = this; } - - WinSalObject::~WinSalObject() { SalData* pSalData = GetSalData(); @@ -626,22 +603,16 @@ WinSalObject::~WinSalObject() ImplSendMessage( hWndParent, SAL_MSG_FORCEPALETTE, 0, 0 ); } - - void WinSalObject::ResetClipRegion() { SetWindowRgn( mhWnd, 0, TRUE ); } - - sal_uInt16 WinSalObject::GetClipRegionType() { return SAL_OBJECT_CLIP_INCLUDERECTS; } - - void WinSalObject::BeginSetClipRegion( sal_uLong nRectCount ) { sal_uLong nRectBufSize = sizeof(RECT)*nRectCount; @@ -662,8 +633,6 @@ void WinSalObject::BeginSetClipRegion( sal_uLong nRectCount ) mbFirstClipRect = TRUE; } - - void WinSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) { RECT* pRect = mpNextClipRect; @@ -701,8 +670,6 @@ void WinSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight mpNextClipRect++; } - - void WinSalObject::EndSetClipRegion() { HRGN hRegion; @@ -726,8 +693,6 @@ void WinSalObject::EndSetClipRegion() SetWindowRgn( mhWnd, hRegion, TRUE ); } - - void WinSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) { sal_uLong nStyle = 0; @@ -742,8 +707,6 @@ void WinSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) SWP_NOZORDER | SWP_NOACTIVATE | nStyle ); } - - void WinSalObject::Show( bool bVisible ) { if ( bVisible ) @@ -752,15 +715,11 @@ void WinSalObject::Show( bool bVisible ) ShowWindow( mhWnd, SW_HIDE ); } - - void WinSalObject::Enable( bool bEnable ) { EnableWindow( mhWnd, bEnable ); } - - void WinSalObject::GrabFocus() { if ( mhLastFocusWnd && |