diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-16 14:14:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-02-17 11:33:57 +0000 |
| commit | 2087484c65a3d5e75a9e8ad116d11a4e13366219 (patch) | |
| tree | 1f335918a854319df9269329d165a91d711d2108 /include/vcl | |
| parent | d6bf086012343b4a1e27cd4242dced9ee0d73a06 (diff) | |
use consistent #define checks for the Windows platform
stage 2 of replacing usage of various checks for the windows platform
with the compiler-defined '_WIN32' macro
In this stage we focus on replacing usage of the WIN macro
Change-Id: Ie8a4a63198a6de96bd158ecd707dadafb9c8ea84
Reviewed-on: https://gerrit.libreoffice.org/22393
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/bitmap.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/graphicfilter.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/settings.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/sysdata.hxx | 16 |
4 files changed, 11 insertions, 11 deletions
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index e45c8f0dd9bb..7dcc84442801 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -238,7 +238,7 @@ namespace vcl struct BitmapSystemData { - #if defined( WNT ) + #if defined(_WIN32) void* pDIB; // device independent byte buffer void* pDDB; // if not NULL then this is actually an HBITMAP #elif defined( MACOSX ) || defined( IOS ) diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index a090c557aa7c..40ea0173f537 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -254,7 +254,7 @@ public: sal_uInt16 GetImportFormatNumberForTypeName( const OUString& rType ); OUString GetImportFormatName( sal_uInt16 nFormat ); OUString GetImportFormatTypeName( sal_uInt16 nFormat ); -#ifdef WNT +#ifdef _WIN32 OUString GetImportFormatMediaType( sal_uInt16 nFormat ); #endif OUString GetImportFormatShortName( sal_uInt16 nFormat ); diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index 932bb9c2de08..537cb8f0c140 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -632,7 +632,7 @@ public: MiscSettings(); ~MiscSettings(); -#ifdef WNT +#ifdef _WIN32 void SetEnableATToolSupport( bool bEnable ); #endif bool GetEnableATToolSupport() const; diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx index 18f39393b274..49511985455e 100644 --- a/include/vcl/sysdata.hxx +++ b/include/vcl/sysdata.hxx @@ -42,7 +42,7 @@ typedef const struct __CTFont * CTFontRef; typedef struct CGContext *CGContextRef; #endif -#if defined( WNT ) +#if defined(_WIN32) #include <prewin.h> #include <windef.h> #include <postwin.h> @@ -51,7 +51,7 @@ typedef struct CGContext *CGContextRef; struct SystemEnvData { unsigned long nSize; // size in bytes of this structure -#if defined( WNT ) +#if defined(_WIN32) HWND hWnd; // the window hwnd #elif defined( MACOSX ) NSView* mpNSView; // the cocoa (NSView *) implementing this object @@ -77,7 +77,7 @@ struct SystemEnvData SystemEnvData() : nSize(0) -#if defined( WNT ) +#if defined(_WIN32) , hWnd(0) #elif defined( MACOSX ) , mpNSView(nullptr) @@ -105,7 +105,7 @@ struct SystemEnvData struct SystemParentData { unsigned long nSize; // size in bytes of this structure -#if defined( WNT ) +#if defined(_WIN32) HWND hWnd; // the window hwnd #elif defined( MACOSX ) NSView* pView; // the cocoa (NSView *) implementing this object @@ -122,7 +122,7 @@ struct SystemParentData struct SystemMenuData { -#if defined( WNT ) +#if defined(_WIN32) HMENU hMenu; // the menu handle of the menu bar #else // Nothing @@ -132,7 +132,7 @@ struct SystemMenuData struct SystemGraphicsData { unsigned long nSize; // size in bytes of this structure -#if defined( WNT ) +#if defined(_WIN32) HDC hDC; // handle to a device context HWND hWnd; // optional handle to a window #elif defined( MACOSX ) @@ -152,7 +152,7 @@ struct SystemGraphicsData #endif SystemGraphicsData() : nSize( sizeof( SystemGraphicsData ) ) -#if defined( WNT ) +#if defined(_WIN32) , hDC( 0 ) , hWnd( 0 ) #elif defined( MACOSX ) @@ -176,7 +176,7 @@ struct SystemGraphicsData struct SystemWindowData { unsigned long nSize; // size in bytes of this structure -#if defined( WNT ) // meaningless on Windows +#if defined(_WIN32) // meaningless on Windows #elif defined( MACOSX ) bool bOpenGL; // create a OpenGL providing NSView bool bLegacy; // create a 2.1 legacy context, only valid if bOpenGL == true |