diff options
Diffstat (limited to 'vcl/inc/win/saldata.hxx')
| -rw-r--r--[-rwxr-xr-x] | vcl/inc/win/saldata.hxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx index 6c040993c76e..ca0a19f4361a 100755..100644 --- a/vcl/inc/win/saldata.hxx +++ b/vcl/inc/win/saldata.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -141,7 +142,7 @@ public: ULONG_PTR gdiplusToken; std::set< HMENU > mhMenuSet; // keeps track of menu handles created by VCL, used by IsKnownMenuHandle() - std::map< UINT,USHORT > maVKMap; // map some dynamic VK_* entries + std::map< UINT,sal_uInt16 > maVKMap; // map some dynamic VK_* entries oslModule maDwmLib; DwmIsCompositionEnabled_ptr mpDwmIsCompositionEnabled; }; @@ -160,8 +161,6 @@ struct SalShlData UINT mnWheelScrollLines; // WheelScrollLines UINT mnWheelScrollChars; // WheelScrollChars UINT mnWheelMsgId; // Wheel-Message-Id fuer W95 - WORD mnVersion; // System-Version (311 == 3.11) - BOOL mbW40; // Is System-Version >= 4.0 BOOL mbWXP; // Windows XP BOOL mbWPrinter; // true: use unicode printer functions // false: use anis compat printer functions @@ -348,8 +347,6 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 ); // ----------------- // A/W-Wrapper -LONG ImplSetWindowLong( HWND hWnd, int nIndex, DWORD dwNewLong ); -LONG ImplGetWindowLong( HWND hWnd, int nIndex ); BOOL ImplPostMessage( HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam ); BOOL ImplSendMessage( HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam ); BOOL ImplGetMessage( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax ); @@ -358,22 +355,24 @@ LONG ImplDispatchMessage( CONST MSG *lpMsg ); inline void SetWindowPtr( HWND hWnd, WinSalFrame* pThis ) { - ImplSetWindowLong( hWnd, SAL_FRAME_THIS, (LONG)pThis ); + SetWindowLongPtr( hWnd, SAL_FRAME_THIS, (LONG_PTR)pThis ); } inline WinSalFrame* GetWindowPtr( HWND hWnd ) { - return (WinSalFrame*)ImplGetWindowLong( hWnd, SAL_FRAME_THIS ); + return (WinSalFrame*)GetWindowLongPtrW( hWnd, SAL_FRAME_THIS ); } inline void SetSalObjWindowPtr( HWND hWnd, WinSalObject* pThis ) { - ImplSetWindowLong( hWnd, SAL_OBJECT_THIS, (LONG)pThis ); + SetWindowLongPtr( hWnd, SAL_OBJECT_THIS, (LONG_PTR)pThis ); } inline WinSalObject* GetSalObjWindowPtr( HWND hWnd ) { - return (WinSalObject*)ImplGetWindowLong( hWnd, SAL_OBJECT_THIS ); + return (WinSalObject*)GetWindowLongPtr( hWnd, SAL_OBJECT_THIS ); } #endif // _SV_SALDATA_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |