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 /toolkit | |
| 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 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxsystemdependentwindow.cxx | 10 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 8 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxtopwindow.cxx | 10 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxwindow1.cxx | 4 |
4 files changed, 16 insertions, 16 deletions
diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx index 488119109b40..18e4a0224122 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -75,23 +75,23 @@ css::uno::Any VCLXSystemDependentWindow::getWindowHandle( const css::uno::Sequen const SystemEnvData* pSysData = static_cast<SystemChildWindow *>(pWindow)->GetSystemData(); if( pSysData ) { -#if (defined WNT) +#if defined(_WIN32) if( SystemType == css::lang::SystemDependent::SYSTEM_WIN32 ) { aRet <<= reinterpret_cast<sal_IntPtr>(pSysData->hWnd); } -#elif (defined MACOSX) +#elif defined(MACOSX) if( SystemType == css::lang::SystemDependent::SYSTEM_MAC ) { aRet <<= reinterpret_cast<sal_IntPtr>(pSysData->mpNSView); } -#elif (defined ANDROID) +#elif defined(ANDROID) // Nothing (void) SystemType; -#elif (defined IOS) +#elif defined(IOS) // Nothing (void) SystemType; -#elif (defined UNX) +#elif defined(UNX) if( SystemType == css::lang::SystemDependent::SYSTEM_XWINDOW ) { css::awt::SystemDependentXWindow aSD; diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index a3fed7c7c42f..c72c1b6216a5 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -18,7 +18,7 @@ */ #include <stdio.h> -#ifdef WNT +#ifdef _WIN32 #include <prewin.h> #include <postwin.h> #endif @@ -124,11 +124,11 @@ #define VCLWINDOW_FRAMEWINDOW 0x1000 #define VCLWINDOW_SYSTEMCHILDWINDOW 0x1001 -#if (defined WNT) +#if defined(_WIN32) #define SYSTEM_DEPENDENT_TYPE css::lang::SystemDependent::SYSTEM_WIN32 -#elif (defined MACOSX) +#elif defined(MACOSX) #define SYSTEM_DEPENDENT_TYPE css::lang::SystemDependent::SYSTEM_MAC -#elif (defined UNX) +#elif defined(UNX) #define SYSTEM_DEPENDENT_TYPE css::lang::SystemDependent::SYSTEM_XWINDOW #endif diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index a9853e17468b..781a7cbbf21b 100644 --- a/toolkit/source/awt/vclxtopwindow.cxx +++ b/toolkit/source/awt/vclxtopwindow.cxx @@ -86,23 +86,23 @@ css::uno::Any VCLXTopWindow_Base::getWindowHandle( const css::uno::Sequence< sal const SystemEnvData* pSysData = static_cast<SystemWindow *>(pWindow)->GetSystemData(); if( pSysData ) { -#if (defined WNT) +#if defined (_WIN32) if( SystemType == css::lang::SystemDependent::SYSTEM_WIN32 ) { aRet <<= reinterpret_cast<sal_IntPtr>(pSysData->hWnd); } -#elif (defined MACOSX) +#elif defined(MACOSX) if( SystemType == css::lang::SystemDependent::SYSTEM_MAC ) { aRet <<= reinterpret_cast<sal_IntPtr>(pSysData->mpNSView); } -#elif (defined ANDROID) +#elif defined(ANDROID) // Nothing (void) SystemType; -#elif (defined IOS) +#elif defined(IOS) // Nothing (void) SystemType; -#elif (defined UNX) +#elif defined(UNX) if( SystemType == css::lang::SystemDependent::SYSTEM_XWINDOW ) { css::awt::SystemDependentXWindow aSD; diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx index f6783b1068cd..ef471500df49 100644 --- a/toolkit/source/awt/vclxwindow1.cxx +++ b/toolkit/source/awt/vclxwindow1.cxx @@ -23,7 +23,7 @@ #include <vcl/wrkwin.hxx> #include <vcl/window.hxx> -#ifdef WNT +#ifdef _WIN32 #include <prewin.h> #include <postwin.h> #elif defined ( MACOSX ) @@ -77,7 +77,7 @@ void VCLXWindow::SetSystemParent_Impl( const css::uno::Any& rHandle ) // create system parent data SystemParentData aSysParentData; aSysParentData.nSize = sizeof ( SystemParentData ); -#if defined( WNT ) +#if defined(_WIN32) aSysParentData.hWnd = (HWND) nHandle; #elif defined( MACOSX ) aSysParentData.pView = reinterpret_cast<NSView*>(nHandle); |