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__.

include/wx/msw/ole/uuid.h

@@ -20,7 +20,6 @@
 
 // ----- taken from RPC.H
 #ifndef UUID_DEFINED            // in some cases RPC.H will be already
-  #ifdef  __WIN32__             // included, so avoid redefinition
     typedef struct
     {
       unsigned long   Data1;
@@ -28,7 +27,6 @@
       unsigned short  Data3;
       unsigned char   Data4[8];
     } UUID;                     // UUID = GUID = CLSID = LIBID = IID
-  #endif  // WIN32
 #endif  // UUID_DEFINED
 
 #ifndef GUID_DEFINED

include/wx/msw/private.h

@@ -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))

include/wx/msw/textctrl.h

@@ -74,9 +74,7 @@ public:
     virtual void MarkDirty();
     virtual void DiscardEdits();
 
-#ifdef __WIN32__
     virtual bool EmulateKeyPress(const wxKeyEvent& event);
-#endif // __WIN32__
 
 #if wxUSE_RICHEDIT
     // apply text attribute to the range of text (only works with richedit

include/wx/msw/window.h

@@ -355,9 +355,7 @@ public:
 #if wxUSE_HOTKEY
     bool HandleHotKey(WXWPARAM wParam, WXLPARAM lParam);
 #endif
-#ifdef __WIN32__
     int HandleMenuChar(int chAccel, WXLPARAM lParam);
-#endif
     // Create and process a clipboard event specified by type.
     bool HandleClipboardEvent( WXUINT nMsg );