From 1a494d9a00208eef790400bdbd8b3e5c7fed4886 Mon Sep 17 00:00:00 2001
From: Ashod Nakashian <ashodnakashian@yahoo.com>
Date: Tue, 10 Nov 2015 20:47:58 -0500
Subject: Windows header sanitization
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Isolation of windows headers using prewin.h
and postwin.h headers and making headers
dependent on them more self contained.

Conversion of TCHAR to WCHAR and
LPCTSTR to LPCWSTR etc. and cleanup
of unnecessary casts.

Change-Id: I7eff5c477d9223a064bfb4d962ff6d61960ee69c
Reviewed-on: https://gerrit.libreoffice.org/19901
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 canvas/source/directx/dx_winstuff.hxx | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

(limited to 'canvas/source/directx')

diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx
index 478acaf61435..0d629b431d76 100644
--- a/canvas/source/directx/dx_winstuff.hxx
+++ b/canvas/source/directx/dx_winstuff.hxx
@@ -25,15 +25,9 @@
 
 #include <basegfx/numeric/ftools.hxx>
 
-#if defined _MSC_VER
-#pragma warning(push,1)
-#endif
 
-#ifndef _WINDOWS_
 #define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-#endif
+#include "prewin.h"
 
 // Enabling Direct3D Debug Information Further more, with registry key
 // \\HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Direct3D\D3D9Debugging\\EnableCreationStack
@@ -43,18 +37,11 @@
 # define D3D_DEBUG_INFO
 #endif
 
-
-#define GradientStyle_RECT win32GradientStyle_RECT
-#undef WB_LEFT
-#undef WB_RIGHT
-
 #include <d3d9.h>
 
 typedef IDirect3DSurface9 surface_type;
 
 
-#undef DrawText
-
 #ifndef max
 #define max(a,b) (((a) > (b)) ? (a) : (b))
 #endif
@@ -166,12 +153,8 @@ namespace dxcanvas
     }
 }
 
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
 
-#undef DELETE
-#undef GradientStyle_RECT
+#include "postwin.h"
 
 #endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_WINSTUFF_HXX
 
-- 
cgit