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>

26 files changed, 53 insertions, 53 deletions

diff --git a/vcl/inc/fontselect.hxx b/vcl/inc/fontselect.hxx
index e8b19b408f53..57f1815c3ee2 100644
--- a/vcl/inc/fontselect.hxx
+++ b/vcl/inc/fontselect.hxx
@@ -37,7 +37,7 @@ class FontSelectPatternAttributes : public FontAttributes
 public:
                     FontSelectPatternAttributes( const vcl::Font&, const OUString& rSearchName,
                                                  const Size&, float fExactHeight );
-#ifdef WNT
+#ifdef _WIN32
                     FontSelectPatternAttributes( const PhysicalFontFace&, const Size&,
                                                  float fExactHeight, int nOrientation, bool bVertical );
 #endif
@@ -70,7 +70,7 @@ class FontSelectPattern : public FontSelectPatternAttributes
 public:
                     FontSelectPattern( const vcl::Font&, const OUString& rSearchName,
                                        const Size&, float fExactHeight );
-#ifdef WNT
+#ifdef _WIN32
 // ifdeffed to prevent it going into unusedcode.easy
                     FontSelectPattern( const PhysicalFontFace&, const Size&,
                                        float fExactHeight, int nOrientation, bool bVertical );
diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index ff258bff3a1d..a3076f4c8b9b 100644
--- a/vcl/inc/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -135,7 +135,7 @@ public:
 
     virtual ~GraphiteLayout() throw();
     void SetFont(gr_font * pFont) { mpFont = pFont; }
-#ifdef WNT
+#ifdef _WIN32
     gr_font * GetFont() { return mpFont; }
     void SetFontScale(float s) { mfScaling = s; };
 #endif
diff --git a/vcl/inc/graphite_static.hxx b/vcl/inc/graphite_static.hxx
index f57bd85a9878..c13333150a56 100644
--- a/vcl/inc/graphite_static.hxx
+++ b/vcl/inc/graphite_static.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_VCL_INC_GRAPHITE_STATIC_HXX
 #define INCLUDED_VCL_INC_GRAPHITE_STATIC_HXX
 
-#ifdef WNT
+#ifdef _WIN32
 #  ifndef GRAPHITE2_STATIC
 #    define GRAPHITE2_STATIC 1
 #  endif
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index c7f6630bb993..e4daced652ee 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -472,7 +472,7 @@ namespace vcl
  */
     int VCL_DLLPUBLIC MapString(TrueTypeFont *ttf, sal_uInt16 *str, int nchars, sal_uInt16 *glyphArray, bool bvertical);
 
-#if defined(WNT) || defined(MACOSX) || defined(IOS)
+#if defined(_WIN32) || defined(MACOSX) || defined(IOS)
 /**
  * Maps a Unicode (UCS-2) character to a glyph ID and returns it. Missing glyph has
  * a glyphID of 0 so this function can be used to test if a character is encoded in the font.
diff --git a/vcl/inc/svsys.h b/vcl/inc/svsys.h
index 9add1a92fc6e..738ae98af395 100644
--- a/vcl/inc/svsys.h
+++ b/vcl/inc/svsys.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_SVSYS_H
 #define INCLUDED_VCL_INC_SVSYS_H
 
-#ifdef WNT
+#ifdef _WIN32
 #include "win/svsys.h"
 #elif defined MACOSX
 #include "osx/svsys.h"
diff --git a/vcl/inc/win/svsys.h b/vcl/inc/win/svsys.h
index 9753a8789025..44cae93cf741 100644
--- a/vcl/inc/win/svsys.h
+++ b/vcl/inc/win/svsys.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_WIN_SVSYS_H
 #define INCLUDED_VCL_INC_WIN_SVSYS_H
 
-#ifdef WNT
+#ifdef _WIN32
 #ifndef INCLUDED_PRE_POST_WIN_H
 #define INCLUDED_PRE_POST_WIN_H
 #include <prewin.h>
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 0ed06b6dec86..13444e6fa254 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -54,7 +54,7 @@ inline bool determineTextureFormat(sal_uInt16 nBits, GLenum& nFormat, GLenum& nT
         nType = GL_UNSIGNED_BYTE;
         return true;
     case 16:
-#ifdef WNT
+#ifdef _WIN32
         nFormat = GL_BGR;
 #else
         nFormat = GL_RGB;
@@ -62,7 +62,7 @@ inline bool determineTextureFormat(sal_uInt16 nBits, GLenum& nFormat, GLenum& nT
         nType = GL_UNSIGNED_SHORT_5_6_5;
         return true;
     case 24:
-#ifdef WNT
+#ifdef _WIN32
         nFormat = GL_BGR;
 #else
         nFormat = GL_RGB;
@@ -70,7 +70,7 @@ inline bool determineTextureFormat(sal_uInt16 nBits, GLenum& nFormat, GLenum& nT
         nType = GL_UNSIGNED_BYTE;
         return true;
     case 32:
-#ifdef WNT
+#ifdef _WIN32
         nFormat = GL_BGRA;
 #else
         nFormat = GL_RGBA;
@@ -769,7 +769,7 @@ BitmapBuffer* OpenGLSalBitmap::AcquireBuffer( BitmapAccessMode nMode )
             break;
         case 16:
         {
-#ifdef WNT
+#ifdef _WIN32
             pBuffer->mnFormat = BMP_FORMAT_16BIT_TC_LSB_MASK;
             ColorMaskElement aRedMask(0x00007c00);
             aRedMask.CalcMaskShift();
@@ -792,7 +792,7 @@ BitmapBuffer* OpenGLSalBitmap::AcquireBuffer( BitmapAccessMode nMode )
         }
         case 24:
         {
-#ifdef WNT
+#ifdef _WIN32
             pBuffer->mnFormat = BMP_FORMAT_24BIT_TC_BGR;
 #else
             pBuffer->mnFormat = BMP_FORMAT_24BIT_TC_RGB;
@@ -801,7 +801,7 @@ BitmapBuffer* OpenGLSalBitmap::AcquireBuffer( BitmapAccessMode nMode )
         }
         case 32:
         {
-#ifdef WNT
+#ifdef _WIN32
             pBuffer->mnFormat = BMP_FORMAT_32BIT_TC_BGRA;
             ColorMaskElement aRedMask(0x00ff0000);
             aRedMask.CalcMaskShift();
diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx
index 7455b4b2bdf2..4336e6bb7e87 100644
--- a/vcl/qa/cppunit/BitmapTest.cxx
+++ b/vcl/qa/cppunit/BitmapTest.cxx
@@ -76,7 +76,7 @@ void BitmapTest::testConvert()
         CPPUNIT_ASSERT_EQUAL(sal_uLong(40), pReadAccess->GetScanlineSize());
 #else
         CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(24), pReadAccess->GetBitCount());
-#if defined WNT
+#if defined(_WIN32)
         if (!OpenGLHelper::isVCLOpenGLEnabled())
         {
             // GDI Scanlines padded to DWORD multiples, it seems
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index 31717ccdd12e..b0fa4d72cb80 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -22,13 +22,13 @@ public:
 
     /// Play with font measuring etc.
     void testArabic();
-#if defined(WNT)
+#if defined(_WIN32)
     void testTdf95650(); // Windows-only issue
 #endif
 
     CPPUNIT_TEST_SUITE(VclComplexTextTest);
     CPPUNIT_TEST(testArabic);
-#if defined(WNT)
+#if defined(_WIN32)
     CPPUNIT_TEST(testTdf95650);
 #endif
     CPPUNIT_TEST_SUITE_END();
@@ -83,7 +83,7 @@ void VclComplexTextTest::testArabic()
 #endif
 }
 
-#if defined(WNT)
+#if defined(_WIN32)
 void VclComplexTextTest::testTdf95650()
 {
     const sal_Unicode pTxt[] = {
diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx
index 22fa582114c5..0d3afa1ace8d 100644
--- a/vcl/qa/cppunit/timer.cxx
+++ b/vcl/qa/cppunit/timer.cxx
@@ -127,7 +127,7 @@ void TimerTest::testIdle()
 // tdf#91727
 void TimerTest::testIdleMainloop()
 {
-#ifndef WNT
+#ifndef _WIN32
     bool bTriggered = false;
     IdleBool aTest( bTriggered );
     // coverity[loop_top] - Application::Yield allows the timer to fire and toggle bDone
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 296684b3dfd9..cb84dbe0aaa6 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -21,7 +21,7 @@
 
 #include <officecfg/Office/Common.hxx>
 
-#ifdef WNT
+#ifdef _WIN32
 #include "win/svsys.h"
 #endif
 
@@ -2472,7 +2472,7 @@ bool MiscSettings::GetDisablePrinting() const
 bool MiscSettings::GetEnableATToolSupport() const
 {
 
-#ifdef WNT
+#ifdef _WIN32
     if( mxData->mnEnableATT == TRISTATE_INDET )
     {
         // Check in the Windows registry if an AT tool wants Accessibility support to
@@ -2540,7 +2540,7 @@ bool MiscSettings::GetEnableATToolSupport() const
     return mxData->mnEnableATT != TRISTATE_FALSE;
 }
 
-#ifdef WNT
+#ifdef _WIN32
 void MiscSettings::SetEnableATToolSupport( bool bEnable )
 {
     if ( (bEnable ? TRISTATE_TRUE : TRISTATE_FALSE) != mxData->mnEnableATT )
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 675a84893fe2..2ed5292eb121 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -540,7 +540,7 @@ void Application::ReAcquireSolarMutex(sal_uLong const nReleased)
     // 0 would mean that events/timers will be handled without locking
     // SolarMutex (racy)
     SAL_WARN_IF(nReleased == 0, "vcl", "SolarMutexReleaser without SolarMutex");
-#ifdef WNT
+#ifdef _WIN32
     if (nReleased == 0 || ImplGetSVData()->mbDeInit) //do not Yield in DeInitVCL
         AcquireSolarMutex(nReleased);
     else
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index a8bac5775b59..c7bcb9191dcb 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -44,7 +44,7 @@
 #include <vcl/embeddedfontshelper.hxx>
 #include <vcl/debugevent.hxx>
 
-#ifdef WNT
+#ifdef _WIN32
 #include <svsys.h>
 #include <process.h>
 #include <ole2.h>
@@ -578,7 +578,7 @@ struct WorkerThreadData
     }
 };
 
-#ifdef WNT
+#ifdef _WIN32
 static HANDLE hThreadID = 0;
 static unsigned __stdcall _threadmain( void *pArgs )
 {
@@ -604,7 +604,7 @@ static void SAL_CALL MainWorkerFunction( void* pArgs )
 
 void CreateMainLoopThread( oslWorkerFunction pWorker, void * pThreadData )
 {
-#ifdef WNT
+#ifdef _WIN32
     // sal thread always call CoInitializeEx, so a system dependent implementation is necessary
 
     unsigned uThreadID;
@@ -624,7 +624,7 @@ void JoinMainLoopThread()
 {
     if( hThreadID )
     {
-#ifdef WNT
+#ifdef _WIN32
         WaitForSingleObject(hThreadID, INFINITE);
 #else
         osl_joinWithThread(hThreadID);
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index dc835ed7f645..68b36953e2c6 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -156,7 +156,7 @@ OUString Button::GetStandardText( StandardButtonType eButton )
     }
 
     sal_uInt32 nResId = aResIdAry[(sal_uInt16)eButton].nResId;
-#ifdef WNT
+#ifdef _WIN32
     // http://lists.freedesktop.org/archives/libreoffice/2013-January/044513.html
     // Under windows we don't want accelerators on ok/cancel but do on other
     // buttons
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index fad4a2d77429..85b28dc78889 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1191,7 +1191,7 @@ OUString GraphicFilter::GetImportFormatTypeName( sal_uInt16 nFormat )
     return pConfig->GetImportFilterTypeName( nFormat );
 }
 
-#ifdef WNT
+#ifdef _WIN32
 OUString GraphicFilter::GetImportFormatMediaType( sal_uInt16 nFormat )
 {
     return pConfig->GetImportFormatMediaType( nFormat );
diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx
index 25e8decb6ea6..10e84cc53f68 100644
--- a/vcl/source/filter/sgvtext.cxx
+++ b/vcl/source/filter/sgvtext.cxx
@@ -481,7 +481,7 @@ sal_uInt16 SetTextContext(OutputDevice& rOut, ObjTextType& Atr, bool Kapt, sal_u
         switch (Atr.GetFont()) {
           case 92500: case 92501: case 92504: case 92505:
           {
-#if defined(WNT)
+#if defined(_WIN32)
               FNam = "Times New Roman";  // CG Times is Times New Roman in Windows
 #else
               FNam = "Times";            // otherwise just Times
@@ -490,7 +490,7 @@ sal_uInt16 SetTextContext(OutputDevice& rOut, ObjTextType& Atr, bool Kapt, sal_u
               aFont.SetFamily(FAMILY_ROMAN);
           } break;
           case 94021: case 94022: case 94023: case 94024: {
-#if defined(WNT)
+#if defined(_WIN32)
               FNam = "Arial";            // Univers is Arial in Windows
 #else
               FNam = "Helvetica";        // otherwise Helvetica
@@ -499,7 +499,7 @@ sal_uInt16 SetTextContext(OutputDevice& rOut, ObjTextType& Atr, bool Kapt, sal_u
               StdBrei=47;
           } break;
           case 93950: case 93951: case 93952: case 93953: {
-#if defined(WNT)
+#if defined(_WIN32)
               FNam = "Courier New";      // The vector-Courierfont is called Courier New in Windows
 #else
               FNam = "Courier";          // otherwise Courier remains Courier
diff --git a/vcl/source/font/fontselect.cxx b/vcl/source/font/fontselect.cxx
index ce4704556cbc..d13b2e0b41b1 100644
--- a/vcl/source/font/fontselect.cxx
+++ b/vcl/source/font/fontselect.cxx
@@ -70,7 +70,7 @@ FontSelectPatternAttributes::FontSelectPatternAttributes( const vcl::Font& rFont
 
 
 // NOTE: this ctor is still used on Windows. Do not remove.
-#ifdef WNT
+#ifdef _WIN32
 FontSelectPatternAttributes::FontSelectPatternAttributes( const PhysicalFontFace& rFontData,
     const Size& rSize, float fExactHeight, int nOrientation, bool bVertical )
     : FontAttributes( rFontData )
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 3a6921e9c5cd..69d3fefbcfd6 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2415,7 +2415,7 @@ int MapString(TrueTypeFont *ttf, sal_uInt16 *str, int nchars, sal_uInt16 *glyphA
     return nchars;
 }
 
-#if defined(WNT) || defined(MACOSX) || defined(IOS)
+#if defined(_WIN32) || defined(MACOSX) || defined(IOS)
 sal_uInt16 MapChar(TrueTypeFont *ttf, sal_uInt16 ch, bool bvertical)
 {
     switch (ttf->cmapType) {
diff --git a/vcl/source/glyphs/graphite_features.cxx b/vcl/source/glyphs/graphite_features.cxx
index f190b523cefc..932ec61194ae 100644
--- a/vcl/source/glyphs/graphite_features.cxx
+++ b/vcl/source/glyphs/graphite_features.cxx
@@ -25,7 +25,7 @@
 #include <sal/types.h>
 #include <osl/endian.h>
 
-#ifdef WNT
+#ifdef _WIN32
 #include <windows.h>
 #endif
 
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index dcdd31dafd1b..9c48b1589d7e 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -60,7 +60,7 @@
 #ifdef GRLAYOUT_DEBUG
 static FILE * grLog()
 {
-#ifdef WNT
+#ifdef _WIN32
     static FILE * grLogFile = NULL;
     if (grLogFile == NULL)
     {
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 49a9b3e6d5d9..ba615ad9afaf 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -28,7 +28,7 @@
 #include <postmac.h>
 #endif
 
-#if defined( WNT )
+#if defined(_WIN32)
 #include <win/saldata.hxx>
 #endif
 
@@ -1089,7 +1089,7 @@ void OpenGLContext::setWinSize(const Size& rSize)
 }
 
 
-#if defined( WNT )
+#if defined(_WIN32)
 
 bool OpenGLContext::initWindow()
 {
@@ -1252,7 +1252,7 @@ void OpenGLContext::reset()
     mbInitialized = false;
 
     // destroy the context itself
-#if defined( WNT )
+#if defined(_WIN32)
     if (m_aGLWin.hRC)
     {
         std::vector<HGLRC>::iterator itr = std::remove(g_vShareList.begin(), g_vShareList.end(), m_aGLWin.hRC);
@@ -1287,7 +1287,7 @@ void OpenGLContext::reset()
 #endif
 }
 
-#if defined( WNT ) || defined( MACOSX ) || defined( IOS ) || defined( ANDROID )
+#if defined(_WIN32) || defined( MACOSX ) || defined( IOS ) || defined( ANDROID )
 
 SystemWindowData OpenGLContext::generateWinData(vcl::Window* /*pParent*/, bool bRequestLegacyContext)
 {
@@ -1350,7 +1350,7 @@ bool OpenGLContext::isCurrent()
 {
     OpenGLZone aZone;
 
-#if defined( WNT )
+#if defined(_WIN32)
     return wglGetCurrentContext() == m_aGLWin.hRC &&
            wglGetCurrentDC() == m_aGLWin.hDC;
 #elif defined( MACOSX )
@@ -1366,7 +1366,7 @@ bool OpenGLContext::isCurrent()
 
 bool OpenGLContext::hasCurrent()
 {
-#if defined( WNT )
+#if defined(_WIN32)
     return wglGetCurrentContext() != NULL;
 #elif defined( MACOSX ) || defined( IOS ) || defined( ANDROID ) || defined(LIBO_HEADLESS)
     return false;
@@ -1414,7 +1414,7 @@ void OpenGLContext::makeCurrent()
 
     clearCurrent();
 
-#if defined( WNT )
+#if defined(_WIN32)
     if (!wglMakeCurrent(m_aGLWin.hDC, m_aGLWin.hRC))
     {
         SAL_WARN("vcl.opengl", "OpenGLContext::makeCurrent(): wglMakeCurrent failed: " << GetLastError());
@@ -1509,7 +1509,7 @@ void OpenGLContext::resetCurrent()
 
     OpenGLZone aZone;
 
-#if defined( WNT )
+#if defined(_WIN32)
     wglMakeCurrent(NULL, NULL);
 #elif defined( MACOSX )
     (void) this; // loplugin:staticmethods
@@ -1526,7 +1526,7 @@ void OpenGLContext::swapBuffers()
 {
     OpenGLZone aZone;
 
-#if defined( WNT )
+#if defined(_WIN32)
     SwapBuffers(m_aGLWin.hDC);
 #elif defined( MACOSX )
     NSOpenGLView* pView = getOpenGLView();
@@ -1557,7 +1557,7 @@ void OpenGLContext::sync()
 {
     OpenGLZone aZone;
 
-#if defined( WNT )
+#if defined(_WIN32)
     // nothing
 #elif defined( MACOSX ) || defined( IOS ) || defined( ANDROID ) || defined(LIBO_HEADLESS)
     (void) this; // loplugin:staticmethods
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 9b829d633a95..59a970a8caae 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -324,7 +324,7 @@ bool VclBox::set_property(const OString &rKey, const OString &rValue)
 
 sal_uInt16 VclBox::getDefaultAccessibleRole() const
 {
-#if defined(WNT)
+#if defined(_WIN32)
     //fdo#74284 call Boxes Panels, keep then as "Filler" under
     //at least Linux seeing as that's what Gtk does for GtkBoxes
     return css::accessibility::AccessibleRole::PANEL;
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index 1032bb5b688e..913b47c7bb42 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -733,7 +733,7 @@ Reference< css::datatransfer::dnd::XDragSource > Window::GetDragSource()
                 {
                     Sequence< Any > aDragSourceAL( 2 ), aDropTargetAL( 2 );
                     OUString aDragSourceSN, aDropTargetSN;
-#if defined WNT
+#if defined(_WIN32)
                     aDragSourceSN = "com.sun.star.datatransfer.dnd.OleDragSource";
                     aDropTargetSN = "com.sun.star.datatransfer.dnd.OleDropTarget";
                     aDragSourceAL[ 1 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->hWnd) ) );
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index f451c384f77d..4bbe7fafe5f5 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -204,7 +204,7 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle( bool bUseJava )
     sal_IntPtr nRet = 0;
 
     (void)bUseJava;
-#if defined WNT
+#if defined(_WIN32)
     nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->hWnd );
 #elif defined MACOSX
     // FIXME: this is wrong
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 0aa3f19c05c2..b147b0e1ff0c 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -41,7 +41,7 @@
 #include <toolbox.h>
 #include <salframe.hxx>
 #include <spin.hxx>
-#if defined WNT
+#if defined(_WIN32)
 #include <svsys.h>
 #endif
 
@@ -5656,7 +5656,7 @@ void ToolBox::ImplHideFocus()
 
 void ToolBox::ImplDisableFlatButtons()
 {
-#ifdef WNT        // Check in the Windows registry if an AT tool wants no flat toolboxes
+#ifdef _WIN32        // Check in the Windows registry if an AT tool wants no flat toolboxes
     static bool bInit = false, bValue = false;
     if( ! bInit )
     {
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 599514d66354..e6ea5e82419e 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -70,7 +70,7 @@
 #include <set>
 #include <typeinfo>
 
-#ifdef WNT // see #140456#
+#ifdef _WIN32 // see #140456#
 #include <win/salframe.h>
 #endif
 
@@ -3692,7 +3692,7 @@ Reference< css::rendering::XCanvas > Window::ImplGetCanvas( const Size& rFullscr
 
     if(xCanvasFactory.is())
     {
-#ifdef WNT
+#ifdef _WIN32
         // see #140456# - if we're running on a multiscreen setup,
         // request special, multi-screen safe sprite canvas
         // implementation (not DX5 canvas, as it cannot cope with
@@ -3721,7 +3721,7 @@ Reference< css::rendering::XCanvas > Window::ImplGetCanvas( const Size& rFullscr
                              xContext ),
                          UNO_QUERY );
 
-#ifdef WNT
+#ifdef _WIN32
         }
 #endif
         mpWindowImpl->mxCanvas = xCanvas;