Update wx to r75363 to address a wx bug that was breaking netplay on OS X.

Externals/wxWidgets3/include/wx/msw/combobox.h

@@ -133,6 +133,9 @@ protected:
 
     virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
 
+    // Override this one to avoid eating events from our popup listbox.
+    virtual wxWindow *MSWFindItem(long id, WXHWND hWnd) const;
+
     // this is the implementation of GetEditHWND() which can also be used when
     // we don't have the edit control, it simply returns NULL then
     //

Externals/wxWidgets3/include/wx/msw/control.h

@@ -121,6 +121,9 @@ protected:
     // one
     virtual WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd);
 
+    // Look in our GetSubcontrols() for the windows with the given ID.
+    virtual wxWindow *MSWFindItem(long id, WXHWND hWnd) const;
+
     // for controls like radiobuttons which are really composite this array
     // holds the ids (not HWNDs!) of the sub controls
     wxArrayLong m_subControls;

Externals/wxWidgets3/include/wx/msw/datectrl.h

@@ -54,7 +54,9 @@ public:
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
 protected:
+#if wxUSE_INTL
     virtual wxLocaleInfo MSWGetFormat() const;
+#endif // wxUSE_INTL
     virtual bool MSWAllowsNone() const { return HasFlag(wxDP_ALLOWNONE); }
     virtual bool MSWOnDateTimeChange(const tagNMDATETIMECHANGE& dtch);
 

Externals/wxWidgets3/include/wx/msw/datetimectrl.h

@@ -55,12 +55,14 @@ protected:
     // override these methods anyhow, it does work -- but is definitely ugly
     // and need to be changed (but how?) in the future.
 
+#if wxUSE_INTL
     // Override to return the date/time format used by this control.
     virtual wxLocaleInfo MSWGetFormat() const /* = 0 */
     {
         wxFAIL_MSG( "Unreachable" );
         return wxLOCALE_TIME_FMT;
     }
+#endif // wxUSE_INTL
 
     // Override to indicate whether we can have no date at all.
     virtual bool MSWAllowsNone() const /* = 0 */

Externals/wxWidgets3/include/wx/msw/genrcdefs.h

@@ -19,7 +19,7 @@ EMIT(#define wxUSE_RC_MANIFEST 1)
 EMIT(#define wxUSE_RC_MANIFEST 1)
 #endif
 
-#ifdef _M_AMD64
+#if defined _M_AMD64 || defined __x86_64__
 EMIT(#define WX_CPU_AMD64)
 #endif
 
@@ -27,7 +27,7 @@ EMIT(#define WX_CPU_AMD64)
 EMIT(#define WX_CPU_ARM)
 #endif
 
-#ifdef _M_IA64
+#if defined _M_IA64 || defined __ia64__
 EMIT(#define WX_CPU_IA64)
 #endif
 

Externals/wxWidgets3/include/wx/msw/missing.h

@@ -664,7 +664,7 @@ typedef struct
 #include <_mingw.h>
 #endif
 
-#if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)
+#ifdef __MINGW32_TOOLCHAIN__
 typedef enum CommandStateChangeConstants {
     CSC_UPDATECOMMANDS = (int) 0xFFFFFFFF,
     CSC_NAVIGATEFORWARD = 0x1,

Externals/wxWidgets3/include/wx/msw/msvcrt.h

@@ -37,7 +37,12 @@
     #endif
 
     #include <stdlib.h>
-    #ifndef _CRTBLD
+
+    // Defining _CRTBLD should never be necessary at all, but keep it for now
+    // as there is no time to retest all the compilers before 3.0 release.
+    // Definitely do not use it with MSVS 2013 as defining it results in errors
+    // if the standard <assert.h> is included afterwards.
+    #if !defined(_CRTBLD) && !wxCHECK_VISUALC_VERSION(12)
         // Needed when building with pure MS SDK
         #define _CRTBLD
     #endif

Externals/wxWidgets3/include/wx/msw/ole/automtn.h

@@ -115,11 +115,22 @@ public:
     // this object. The default is LOCALE_SYSTEM_DEFAULT.
     void SetLCID(WXLCID lcid);
 
+    // Returns the flags used for conversions between wxVariant and OLE
+    // VARIANT, see wxOleConvertVariantFlags. The default value is
+    // wxOleConvertVariant_Default but all the objects obtained by GetObject()
+    // inherit the flags from the one that created them.
+    long GetConvertVariantFlags() const;
+
+    // Sets the flags used for conversions between wxVariant and OLE VARIANT,
+    // see wxOleConvertVariantFlags (default is wxOleConvertVariant_Default.
+    void SetConvertVariantFlags(long flags);
+
 public: // public for compatibility only, don't use m_dispatchPtr directly.
     WXIDISPATCH*  m_dispatchPtr;
 
 private:
     WXLCID m_lcid;
+    long   m_convertVariantFlags;
 
     wxDECLARE_NO_COPY_CLASS(wxAutomationObject);
 };

Externals/wxWidgets3/include/wx/msw/ole/dataform.h

@@ -39,14 +39,10 @@ public:
     // default copy ctor/assignment operators ok
 
     // comparison (must have both versions)
-    bool operator==(wxDataFormatId format) const
-        { return m_format == (NativeFormat)format; }
-    bool operator!=(wxDataFormatId format) const
-        { return m_format != (NativeFormat)format; }
-    bool operator==(const wxDataFormat& format) const
-        { return m_format == format.m_format; }
-    bool operator!=(const wxDataFormat& format) const
-        { return m_format != format.m_format; }
+    bool operator==(wxDataFormatId format) const;
+    bool operator!=(wxDataFormatId format) const;
+    bool operator==(const wxDataFormat& format) const;
+    bool operator!=(const wxDataFormat& format) const;
 
     // explicit and implicit conversions to NativeFormat which is one of
     // standard data types (implicit conversion is useful for preserving the

Externals/wxWidgets3/include/wx/msw/ole/oleutils.h

@@ -316,9 +316,25 @@ private:
     SAFEARRAY* m_value;
 };
 
+// Used by wxAutomationObject for its wxConvertOleToVariant() calls.
+enum wxOleConvertVariantFlags
+{
+    wxOleConvertVariant_Default = 0,
+
+    // If wxOleConvertVariant_ReturnSafeArrays  flag is set, SAFEARRAYs
+    // contained in OLE VARIANTs will be returned as wxVariants
+    // with wxVariantDataSafeArray type instead of wxVariants
+    // with the list type containing the (flattened) SAFEARRAY's elements.
+    wxOleConvertVariant_ReturnSafeArrays = 1
+};
+
+WXDLLIMPEXP_CORE
+bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant);
+
+WXDLLIMPEXP_CORE
+bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant,
+                           long flags = wxOleConvertVariant_Default);
 
-WXDLLIMPEXP_CORE bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant);
-WXDLLIMPEXP_CORE bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant);
 #endif // wxUSE_VARIANT
 
 // Convert string to Unicode

Externals/wxWidgets3/include/wx/msw/timectrl.h

@@ -50,7 +50,9 @@ public:
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
 protected:
+#if wxUSE_INTL
     virtual wxLocaleInfo MSWGetFormat() const;
+#endif // wxUSE_INTL
     virtual bool MSWAllowsNone() const { return false; }
     virtual bool MSWOnDateTimeChange(const tagNMDATETIMECHANGE& dtch);
 

Externals/wxWidgets3/include/wx/msw/treectrl.h

@@ -304,6 +304,9 @@ private:
     // item visually spans the entire breadth of the window then
     bool MSWIsOnItem(unsigned flags) const;
 
+    // Delete the given item from the native control.
+    bool MSWDeleteItem(const wxTreeItemId& item);
+
 
     // the hash storing the items attributes (indexed by item ids)
     wxMapTreeAttr m_attrs;

Externals/wxWidgets3/include/wx/msw/window.h

@@ -206,7 +206,7 @@ public:
     // to understand why does it work, look at SubclassWin() code and comments
     bool IsOfStandardClass() const { return m_oldWndProc != NULL; }
 
-    wxWindow *FindItem(long id) const;
+    wxWindow *FindItem(long id, WXHWND hWnd = NULL) const;
     wxWindow *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const;
 
     // MSW only: true if this control is part of the main control
@@ -663,6 +663,15 @@ protected:
 
     bool MSWEnableHWND(WXHWND hWnd, bool enable);
 
+    // Return the pointer to this window or one of its sub-controls if this ID
+    // and HWND combination belongs to one of them.
+    //
+    // This is used by FindItem() and is overridden in wxControl, see there.
+    virtual wxWindow* MSWFindItem(long WXUNUSED(id), WXHWND WXUNUSED(hWnd)) const
+    {
+        return NULL;
+    }
+
 private:
     // common part of all ctors
     void Init();