diff options
| author | Noel Grandin <noel@peralex.com> | 2016-04-13 09:36:25 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-04-13 10:58:00 +0000 |
| commit | 9a2ff36b51f86ca3ade8093d7698314c0d3db6a6 (patch) | |
| tree | 0ad2d4afa2f2d345cced80b48812e8fb302625f1 /vcl/inc | |
| parent | 32102b9aa75a296b99f3fdaf370bd83bfd629f4e (diff) | |
remove dead stuff from Windows SalData
- drop mbInTimerProc field
- drop mnSageStatus,mpSageEnableProc fields i.e. SAGE.DLL (System Agent) workaround, which died out with Win95/98
- convert some TRUE/FALSE constants to true/false where the field is a bool
- drop maDwmLib, mpDwmIsCompositionEnabled fields
Change-Id: I7b773f915dbc329eb0262bc8fee2ea7c72d25c66
Reviewed-on: https://gerrit.libreoffice.org/24047
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/win/saldata.hxx | 9 | ||||
| -rw-r--r-- | vcl/inc/win/wincomp.hxx | 5 |
2 files changed, 1 insertions, 13 deletions
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx index c9215144be4d..03c9faa7acf3 100644 --- a/vcl/inc/win/saldata.hxx +++ b/vcl/inc/win/saldata.hxx @@ -40,8 +40,6 @@ namespace vcl { class Font; } struct HDCCache; struct TempFontItem; -typedef HRESULT (WINAPI *DwmIsCompositionEnabled_ptr)(BOOL*); - #define MAX_STOCKPEN 4 #define MAX_STOCKBRUSH 4 #define SAL_CLIPRECT_COUNT 16 @@ -87,7 +85,6 @@ public: DWORD mnNextTimerTime; DWORD mnLastEventTime; HANDLE mnTimerId; ///< Windows timer id - bool mbInTimerProc; // timer event is currently being dispatched HHOOK mhSalObjMsgHook; // hook to get interesting msg for SalObject HWND mhWantLeaveMsg; // window handle, that want a MOUSELEAVE message AutoTimer* mpMouseLeaveTimer; // Timer for MouseLeave Test @@ -109,10 +106,8 @@ public: BYTE mnCacheDCInUse; // count of CacheDC in use bool mbObjClassInit; // is SALOBJECTCLASS initialised bool mbInPalChange; // is in WM_QUERYNEWPALETTE - DWORD mnAppThreadId; // Id from Applikation-Thread + DWORD mnAppThreadId; // Id from Application-Thread BOOL mbScrSvrEnabled; // ScreenSaver enabled - int mnSageStatus; // status of Sage-DLL (DISABLE_AGENT == does not exist) - SysAgt_Enable_PROC mpSageEnableProc; // funktion to deactivate the system agent SalIcon* mpFirstIcon; // icon cache, points to first icon, NULL if none TempFontItem* mpTempFontItem; bool mbThemeChanged; // true if visual theme was changed: throw away theme handles @@ -123,8 +118,6 @@ public: std::set< HMENU > mhMenuSet; // keeps track of menu handles created by VCL, used by IsKnownMenuHandle() std::map< UINT,sal_uInt16 > maVKMap; // map some dynamic VK_* entries - oslModule maDwmLib; - DwmIsCompositionEnabled_ptr mpDwmIsCompositionEnabled; }; inline void SetSalData( SalData* pData ) { ImplGetSVData()->mpSalData = pData; } diff --git a/vcl/inc/win/wincomp.hxx b/vcl/inc/win/wincomp.hxx index b1f0fa73b334..549b3f4dd175 100644 --- a/vcl/inc/win/wincomp.hxx +++ b/vcl/inc/win/wincomp.hxx @@ -198,11 +198,6 @@ inline HINSTANCE GetWindowInstance( HWND hWnd ) #endif -#define ENABLE_AGENT 1 -#define DISABLE_AGENT 2 -#define GET_AGENT_STATUS 3 -typedef int (APIENTRY* SysAgt_Enable_PROC)( int ); - // - 5.0-Erweiterungen - #ifndef COLOR_GRADIENTACTIVECAPTION |