Remove redundant tests for __WIN32__ in wxMSW code.

This is always defined, Win16 is not supported since ages and Win64 defines
both __WIN32__ and __WIN64__.
This commit is contained in:
Vadim Zeitlin
2015-06-30 18:55:30 +02:00
parent d421373c2e
commit 30b523d1f2
24 changed files with 17 additions and 164 deletions

View File

@@ -99,20 +99,8 @@ WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
#define APIENTRY FAR PASCAL
#endif
#ifdef __WIN32__
#ifndef _EXPORT
#define _EXPORT
#else
#define _EXPORT _export
#endif
#ifndef __WIN32__
typedef signed short int SHORT;
#endif
#if !defined(__WIN32__) // 3.x uses FARPROC for dialogs
#ifndef STRICT
#define DLGPROC FARPROC
#endif
#endif
/*
@@ -160,7 +148,7 @@ extern LONG APIENTRY _EXPORT
// ---------------------------------------------------------------------------
// a wrapper macro for ZeroMemory()
#if defined(__WIN32__) && !defined(__WXMICROWIN__)
#if !defined(__WXMICROWIN__)
#define wxZeroMemory(obj) ::ZeroMemory(&obj, sizeof(obj))
#else
#define wxZeroMemory(obj) memset((void*) & obj, 0, sizeof(obj))